jekyll-theme-h2o-ac 1.3.0 → 1.3.2

data/_includes/plugins/markdown/markdown.html

@@ -0,0 +1,7 @@
+{% include plugins/markdown/mathjax.html %}
+{% if layout.type == "post" %}
+{% include plugins/markdown/fancybox_js.html %}
+{% endif %}
+{% include plugins/markdown/hotkeys.html %}
+{% include plugins/markdown/mermaid_js.html %}
+{% include plugins/markdown/prism_js.html %}

data/_includes/plugins/markdown/mermaid_block.html

@@ -0,0 +1,10 @@
+{% if page.mermaid or site.mermaid %}
+<div class="modal">
+    <div class="modal-content">
+        <header>
+            <span class="close">&times;</span>
+        </header>
+        <div class="container"></div>
+    </div>
+</div>
+{% endif%}

data/_includes/plugins/markdown/mermaid_js.html

@@ -0,0 +1,12 @@
+{% if page.mermaid or site.mermaid %}
+<script src="https://cdn.jsdelivr.net/npm/mermaid@9.1.6/dist/mermaid.min.js"></script>
+<script>
+    $(document).ready(function () {
+        mermaid.initialize({
+            startOnLoad: true,
+            theme: "default",
+        });
+        mermaid.init(undefined, $('.mermaid2'));
+    });
+</script>
+{% endif %}

data/_includes/plugins/markdown/prism_css.html

@@ -0,0 +1,16 @@
+{% assign prisms1 = "coy,dark,funky,okaidia,solarizedlight,tomorrow,twilight" | split: "," %}
+{% assign prisms2 =
+"a11y-dark,atom-dark,base16-ateliersulphurpool.light,cb,coldark-cold,coy-without-shadows,darcula,duotone-dark,duotone-earth,duotone-light,dutone-sea,dutone-space,ghcolors,gruvbox-dark,gruvbox-light,holi-theme,hopscotch,lucario,material-dark,material-light,material-oceanic,night-owl,nord,one-dark,one-light,pojoaque,shades-of-purple,solarized-dark-atom,synthwave84,vs,vsc-dark-plus,xonokai,z-touch"
+| split: "," %}
+{% if prisms1 contains site.prism.theme %}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.28.0/themes/prism-{{site.prism.theme}}.min.css" />
+{% else if prisms2 contains site.prism.theme %}
+<link rel="stylesheet"
+    href="https://cdn.jsdelivr.net/npm/prism-themes@1.9.0/themes/prism-{{site.prism.theme}}.min.css" />
+{% else %}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1.28.0/themes/prism.min.css" />
+{% endif %}
+{% if site.prism.line_numbers %}
+<link rel="stylesheet"
+    href="https://cdn.jsdelivr.net/npm/prismjs@1.28.0/plugins/line-numbers/prism-line-numbers.min.css">
+{% endif %}

data/_includes/plugins/markdown/prism_js.html

@@ -0,0 +1,3 @@
+<script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/components/prism-core.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/plugins/autoloader/prism-autoloader.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/plugins/line-numbers/prism-line-numbers.min.js"></script>

data/_includes/{calendar.html → plugins/others/calendar_block.html}

@@ -9,7 +9,7 @@
             <a id="ex-ghDay-prev" class="button" href="#" aria-label="Prev month">
                 <svg class="icon" aria-hidden="true">
                     <use xlink:href="#icon-left"></use>
-                </svg>       
+                </svg>
             </a>
             <a id="ex-ghDay-next" class="button" href="#" aria-label="Next month">
                 <svg class="icon" aria-hidden="true">

data/_includes/plugins/others/calendar_css.html

@@ -0,0 +1,3 @@
+{% if site.calendar %}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/cal-heatmap.min.css">
+{% endif %}

data/_includes/plugins/others/calendar_js.html

@@ -0,0 +1,8 @@
+{% if site.calendar %}
+<script src="https://cdn.jsdelivr.net/npm/d3@7.9.0/dist/d3.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/cal-heatmap.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/plugins/Tooltip.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/plugins/LegendLite.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/plugins/CalendarLabel.min.js"></script>
+{% endif %}

data/_includes/plugins/others/social_block.html

@@ -0,0 +1,5 @@
+{% if site.social-share %}
+<div class="social-share-wrapper">
+    <div class="social-share"></div>
+</div>
+{% endif %}

data/_includes/plugins/others/social_css.html

@@ -0,0 +1 @@
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/social-share.js@1.0.16/dist/css/share.min.css">

data/_includes/plugins/others/social_js.html

@@ -0,0 +1,15 @@
+<script src="https://cdn.jsdelivr.net/npm/social-share.js@1.0.16/dist/js/social-share.min.js"></script>
+<script>
+    socialShare('.social-share', {
+        sites: [
+            {% for i in site.social-share-items %}
+            '{{ i }}'{% if forloop.last == false %}, {% endif %}
+            {% endfor %}
+        ],
+    wechatQrcodeTitle: "分享到微信朋友圈",
+        wechatQrcodeHelper: '<p>扫码后点击右上角</p><p>将本文分享至朋友圈</p>'
+      });
+    $("a.social-share-icon").each(function () {
+        $(this).attr("aria-label", $(this).attr("class").split(' ')[1])
+    });
+</script>

data/_includes/plugins/search/docsearch_css.html

@@ -0,0 +1,3 @@
+{% if site.search and site.search_type == "docsearch" %}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" />
+{% endif %}

data/_includes/plugins/search/docsearch_js.html

@@ -0,0 +1,19 @@
+{% if site.search and site.search_type == "docsearch" %}
+<script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3"></script>
+<script type="text/javascript">
+    docsearch({
+        appId: "{{ site.docsearch.appId }}",
+        apiKey: "{{ site.docsearch.apiKey }}",
+        indexName: "{{ site.docsearch.indexName }}",
+        container: 'li#search',
+        debug: true,
+    });
+    docsearch({
+        appId: "{{ site.docsearch.appId }}",
+        apiKey: "{{ site.docsearch.apiKey }}",
+        indexName: "{{ site.docsearch.indexName }}",
+        container: '#search-toggle',
+        debug: true,
+    });
+</script>
+{% endif %}

data/_layouts/404.html

@@ -0,0 +1,17 @@
+---
+layout: default
+description: "Sorry, Page Not Found :("
+permalink: /404.html
+---
+
+{% include layouts/header.html %}
+
+<header class="g-banner np-banner {{ site.postPatterns | prepend: 'post-pattern-' }}" data-theme="{{ site.theme-color }}">
+    <div class="post-wrapper">
+        <h1>404</h1>
+        <span class="subheading">{{ page.description }}</span>
+        <a href="{{ site.nav.home }}" class="btn">Back to home</a>
+    </div>
+</header>
+
+

data/_layouts/archives.html

@@ -12,6 +12,9 @@ cover: https://images.unsplash.com/photo-1465189684280-6a8fa9b19a7a?w=1600&q=900
 {% assign unpin_posts_num = unpin_posts | size %}
 {% assign nyear = "1900" %}
 {% assign total_size = 0 %}
+{% assign lang = page.lang | default: site.default_lang %}
+{% assign locales = site.data.locales[lang] %}
+{% assign panel = locales.panel %}
 
 {% for post in site.posts %}
   {% assign post_size = post.content | strip_html | strip_newlines | remove: " " | size %}
@@ -40,88 +43,90 @@ cover: https://images.unsplash.com/photo-1465189684280-6a8fa9b19a7a?w=1600&q=900
 
 <div id="archive-heatmap">
   <div id="ex-ghDay2" class="calendar-top">
-      <a id="ex-ghDay-prev2" class="button" href="#">
+      <a id="ex-ghDay-prev2" class="button" href="#" aria-label="Calendar heatmap prev">
           <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-left"></use>
           </svg>       
       </a>
-      <a id="ex-ghDay-next2" class="button" href="#">
+      <a id="ex-ghDay-next2" class="button" href="#" aria-label="Calendar heatmap next">
           <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-right"></use>
           </svg>
       </a>
-      <a id="ex-ghDay-today2" class="button" href="#">
+      <a id="ex-ghDay-today2" class="button" href="#" aria-label="Calendar heatmap today">
           <svg class="icon" aria-hidden="true">
               <use xlink:href="#icon-rotate"></use>
           </svg>
       </a>
       <div class="legends">
-          <span class="text">Less</span>
+          <span class="text">{{panel.calendar_less}}</span>
           <div id="ex-ghDay-legend2"></div>
-          <span class="text">More</span>
+          <span class="text">{{panel.calendar_more}}</span>
       </div>
   </div>
 </div>
 
 {% assign ssyears = "rat,ox,tiger,rabbit,dragon,snake,horse,goat,monkey,rooster,dog,pig" | split: "," %}
 
-{% if pin_posts_num > 0 %}
-<h3>{{ archives.pin.title }}</h3>
-<ul>
-  {% for post in pin_posts %}
-    <li>
-      <p class="archives-title">
-        <span class="archives-date">
-          {% case site.formats.time %}
-          {% when 0 %}
-            {{ post.date | date: "%Y-%m-%d" }} 
-          {% when 1 %}
-            {{ post.date | date_to_string }}
-          {% else %}
-            {{ post.date | date: "%Y年%-m月%-d日"  }}
-          {% endcase %}
-        </span>
-        <a href="{{ post.url | prepend: site.baseurl }}"> {{ post.title }} </a>
-      </p>
-    </li>
-  {% endfor %}
-{% endif %}
-
-{% if unpin_posts_num > 0%}
-  {% for post in unpin_posts %}
-    {% assign year = post.date | date: '%Y' %}
-    {% assign animal = year | minus:1900 | modulo:12 %}
-    {% if year != nyear %}
-      {% assign nyear = year %}
-      </ul>
-      <h3 class="year">{{ post.date | date: '%Y' }}
-        <span class="icon-item">
-          <svg class="icon animal" aria-hidden="true">
-            <use xlink:href="#icon-{{ ssyears[animal] }}"></use>
-          </svg>
-          <svg class="icon dz" aria-hidden="true">
-            <use xlink:href="#icon-{{ ssyears[animal]}}_dz"></use>
-          </svg>
-        </span>
-      </h3>
-      <ul>
-    {% endif %}
-
-    <li>
-      <p class="archives-title">
-        <span class="archives-date">
-          {% case site.formats.time %}
-          {% when 0 %}
-            {{ post.date | date: "%Y-%m-%d" }} 
-          {% when 1 %}
-            {{ post.date | date_to_string }}
-          {% else %}
-            {{ post.date | date: "%Y年%-m月%-d日"  }}
-          {% endcase %}
-        </span>
-        <a href="{{ post.url | prepend: site.baseurl }}"> {{ post.title }} </a>
-      </p>
-    </li>
-  {% endfor %}
-{% endif %}
-</ul>
+<div id="archive-articles">
+  {% if pin_posts_num > 0 %}
+  <h3>{{ archives.pin.title }}</h3>
+  <ul>
+    {% for post in pin_posts %}
+      <li>
+        <p class="archives-title">
+          <span class="archives-date">
+            {% case site.formats.time %}
+            {% when 0 %}
+              {{ post.date | date: "%Y-%m-%d" }} 
+            {% when 1 %}
+              {{ post.date | date_to_string }}
+            {% else %}
+              {{ post.date | date: "%Y年%-m月%-d日"  }}
+            {% endcase %}
+          </span>
+          <a href="{{ post.url | prepend: site.baseurl }}"> {{ post.title }} </a>
+        </p>
+      </li>
+    {% endfor %}
+  {% endif %}
+  
+  {% if unpin_posts_num > 0%}
+    {% for post in unpin_posts %}
+      {% assign year = post.date | date: '%Y' %}
+      {% assign animal = year | minus:1900 | modulo:12 %}
+      {% if year != nyear %}
+        {% assign nyear = year %}
+        </ul>
+        <h3 class="year">{{ post.date | date: '%Y' }}
+          <span class="icon-item">
+            <svg class="icon animal" aria-hidden="true">
+              <use xlink:href="#icon-{{ ssyears[animal] }}"></use>
+            </svg>
+            <svg class="icon dz" aria-hidden="true">
+              <use xlink:href="#icon-{{ ssyears[animal]}}_dz"></use>
+            </svg>
+          </span>
+        </h3>
+        <ul>
+      {% endif %}
+  
+      <li>
+        <p class="archives-title">
+          <span class="archives-date">
+            {% case site.formats.time %}
+            {% when 0 %}
+              {{ post.date | date: "%m-%d" }} 
+            {% when 1 %}
+              {{ post.date | date_to_string }}
+            {% else %}
+              {{ post.date | date: "%-m月%-d日"  }}
+            {% endcase %}
+          </span>
+          <a href="{{ post.url | prepend: site.baseurl }}"> {{ post.title }} </a>
+        </p>
+      </li>
+    {% endfor %}
+  {% endif %}
+  </ul>
+</div>

data/_layouts/blog.html

@@ -4,8 +4,6 @@ home-title: H2O Theme For Jekyll
 description: 或许是最漂亮的Jekyll主题
 ---
 
-{% include header.html %}
-
 <div
     class="g-banner home-banner {{ site.theme-color | prepend: 'banner-theme-' }}"
     data-theme="{{ site.theme-color }}"
@@ -17,15 +15,11 @@ description: 或许是最漂亮的Jekyll主题
 
 <main class="g-container home-content">
     <div class="article-list">
-        {% include paginate.html %}
+        {% include layouts/paginate.html %}
 
         {% if paginator.total_pages > 1 %}
-            {% include pageNav.html %}
+            {% include layouts/pageNav.html %}
         {% endif %}
     </div>
-
-    {% include sidebar.html %}
-
-</main>
-
-{% include footer.html %}
+    {% include layouts/sidebar.html %}
+</main>

data/_layouts/categories.html

@@ -26,6 +26,7 @@ cover: https://images.unsplash.com/photo-1465189684280-6a8fa9b19a7a?w=1600&q=900
   {% endif %}
 </p>
 
+<div id="archive-articles">
 {% for category in site.categories %}
   {% assign category_name = category | first %}
   <h3 class="category">{{ category[0] }}</h3>
@@ -71,4 +72,5 @@ cover: https://images.unsplash.com/photo-1465189684280-6a8fa9b19a7a?w=1600&q=900
     </li>
   {% endfor %}
   </ul>
-{% endif %}
+{% endif %}
+</div>

data/_layouts/default.html

@@ -1,61 +1,71 @@
 {% assign lang = page.lang | default: site.default_lang %}
 <!DOCTYPE html>
 <html lang="{{ lang }}">
-{% include head.html %}
-
-{% if site.prism.line_numbers %}
-<body class="line-numbers" ontouchstart="">
-{% else %}
-<body ontouchstart="">
-{% endif %}
+    {% include layouts/head.html %}
+    {% if site.prism.line_numbers %}
+    <body class="line-numbers" ontouchstart="">
+    {% else %}
+    <body ontouchstart="">
+    {% endif %}
     <!--[if lt IE 10]>
     <div class="alert-danger" role="alert">你的浏览器实在太太太旧了，放学别走，升级完浏览器再说！<a target="_blank" class="alert-link" href="http://browsehappy.com">立即升级</a></div>
     <![endif]-->
-    {% if site.gray %}
-    <div id=all class="gray" data-theme="{{ site.theme-color }}">
-    {% else %}
-    <div id="all" data-theme="{{ site.theme-color }}">
-    {% endif %}
-      <input id="nm-switch" type="hidden" value="{{ site.nightMode }}">
-      <div class="visible">
-        {{ content }}
-      </div>
-    </div>
-    {% if page.mermaid or site.mermaid %}
-    <div class="modal">
-        <div class="modal-content">
-          <header>
-            <span class="close">&times;</span>
-          </header>
-          <div class="container"></div>
+        {% if layout.type == "post" %}
+        {% if site.gray %}
+        <div id=all class="post gray" data-theme="{{ site.theme-color }}">
+        {% else %}
+        <div id="all" class="post" data-theme="{{ site.theme-color }}">
+        {% endif %}
+            {% assign locales = site.data.locales[lang] %}
+            {% assign post = locales.post %}
+            <div class="alert-tip" id="no-previous">{{ post.tips.left }}</div>
+            <div class="alert-tip" id="no-next">{{ post.tips.right }}</div>
+        {% else %}
+            {% if site.gray %}
+                <div id=all class="gray" data-theme="{{ site.theme-color }}">
+            {% else %}
+                <div id="all" data-theme="{{ site.theme-color }}">
+            {% endif %}
+        {% endif %}
+            <input id="nm-switch" type="hidden" value="{{ site.nightMode }}">
+            {% include layouts/header.html %}
+            {{ content }}
+            {% include layouts/footer.html %}
         </div>
-    </div>
-    {% endif%}
-    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-    {% if site.calendar %}
-    <script src="https://cdn.jsdelivr.net/npm/d3@7.9.0/dist/d3.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/cal-heatmap.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/plugins/Tooltip.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/plugins/LegendLite.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/cal-heatmap@4.2.4/dist/plugins/CalendarLabel.min.js"></script>
-    {% endif %}
-    <script src="https://cdn.jsdelivr.net/npm/clipboard/dist/clipboard.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/components/prism-core.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/plugins/autoloader/prism-autoloader.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/prismjs@1.29.0/plugins/line-numbers/prism-line-numbers.min.js"></script>
-    <script src="{{ "/assets/js/app.min.js" | prepend: site.baseurl }}"></script>
-    <script src="https://cdn.jsdelivr.net/npm/lazysizes@5.3.2/lazysizes.min.js" async></script>
-    <script src="https://at.alicdn.com/t/c/font_3046306_9tox63bysiw.js"></script>
-    {% include waline.html %}
-    {% include analytics.html %}
-    {% include umami.html %}
-    {% include busuanzi.html %}
-    {% include pwa.html %}
-    {% include mathjax.html %}
-    {% include mermaid.html%}
-    {% include webpusher.html %} 
-    {% include comments.html %}     
-</body>
-</html>
+        {% include plugins/markdown/mermaid_block.html %}
+        <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/lazysizes@5.3.2/lazysizes.min.js" async></script>
+        {% if layout.type == "post" %}
+            {% include layouts/metainfo.html %}
+            {% include plugins/others/social_js.html %}
+        {% else %}
+            {% include plugins/others/calendar_js.html %}
+        {% endif %}
+        <script src="https://cdn.jsdelivr.net/npm/clipboard/dist/clipboard.min.js"></script>
+        <script>
+            /**
+            * Better Scroll Experience
+            */
+            function scrollToAdjust(id){
+              var element = document.getElementById(id);
+              var headerOffset = 90;
+              var elementPosition = element.getBoundingClientRect().top;
+              var offsetPosition = elementPosition + window.scrollY - headerOffset;
+              window.scrollTo({
+                  top: offsetPosition,
+                  behavior: "smooth"
+              });
+            }
+        </script>
+        <script src="{{ " /assets/js/app.min.js" | prepend: site.baseurl }}"></script>
+        <script src="https://at.alicdn.com/t/c/font_3046306_ujr2yq34hw.js"></script>
+        {% include plugins/analytics/analytics.html %}
+        {% include plugins/markdown/markdown.html %}
+        {% include plugins/comments/comments_js.html %}
+        {% include plugins/others/pwa.html %}
+        {% include plugins/others/webpusher.html %}
+        {% include plugins/search/docsearch_js.html %}
+  </body>
+
+</html>

data/_layouts/page.html

@@ -2,29 +2,26 @@
 layout: default
 home-title: H2O Theme For Jekyll
 description: 或许是最漂亮的Jekyll主题
+type: page
 ---
 
-{% include header.html %}
 {% assign lang = page.lang | default: site.default_lang %}
 {% assign locales = site.data.locales[lang] %}
-<div
-    class="g-banner home-banner {{ site.theme-color | prepend: 'banner-theme-' }}"
-    data-theme="{{ site.theme-color }}"
-    style="{% if page.cover %}background: url({{ page.cover | relative_url }}) no-repeat center center; background-size: cover;{% endif %}"
->
+<div class="g-banner home-banner {{ site.theme-color | prepend: 'banner-theme-' }}" data-theme="{{ site.theme-color }}"
+    style="{% if page.cover %}background: url({{ page.cover | relative_url }}) no-repeat center center; background-size: cover;{% endif %}">
     <h2>{{ page.home-title }}</h2>
     <h3>{{ page.description }}</h3>
     {% if page.cover_author %}
-        <p class="meta-item">
-            <svg class="icon" aria-hidden="true">
-                <use xlink:href="#icon-image"></use>
-            </svg>
-            {% if page.cover_author_link %}
-                {{ locales.cover }} <a href="{{ page.cover_author_link }}" target="_blank">{{ page.cover_author }}</a>
-            {% else %}
-                {{ locales.cover }} {{ page.cover_author }}
-            {% endif %}
-        </p>
+    <p class="meta-item">
+        <svg class="icon" aria-hidden="true">
+            <use xlink:href="#icon-image"></use>
+        </svg>
+        {% if page.cover_author_link %}
+        {{ locales.cover }} <a href="{{ page.cover_author_link }}" target="_blank">{{ page.cover_author }}</a>
+        {% else %}
+        {{ locales.cover }} {{ page.cover_author }}
+        {% endif %}
+    </p>
     {% endif %}
 </div>
 
@@ -32,80 +29,13 @@ description: 或许是最漂亮的Jekyll主题
     <div class="article-list">
         <div class="post-content" style="padding-left: 30px;padding-right: 30px;width: auto;">
             <article class="markdown-body" style="width: auto;">
-                {% assign lang = page.lang | default: site.default_lang %}
-                {% assign locales = site.data.locales[lang] %}
-                {% if page.langs %}
-                    <p><b>{{ locales.langs }}</b>
-                    {% assign langs = "zh-Hans, zh-Hant, en, ja" | split: ", " %}
-                    {% assign langnames = "简中, 繁中, EN, 日本語" | split: ", " %}
-                    {% if lang == site.default_lang %}
-                        {% assign url = page.url %}
-                    {% else %}
-                        {% assign urls = page.url | split: '/' %}
-                        {% assign url = "" %}
-                        {% for u in urls offset:2 %}
-                            {% assign url = url | append: "/" | append: u %}
-                        {% endfor %}
-                    {% endif %}
-                    {% for l in page.langs %}
-                        {% for i in (0..4) %}
-                            {% if langs[i] == l %}
-                                {% if l == page.lang %}
-                                    {{ langnames[i] }}
-                                {% elsif l == site.default_lang %}
-                                    <a href="{{ url }}">{{ langnames[i] }}</a>
-                                {% else %}
-                                    {% assign prefix = "/" | append: l %}
-                                    <a href="{{ url | prepend: prefix }}">{{ langnames[i] }}</a>
-                                {% endif %}
-                            {% endif %}
-                        {% endfor %}
-                    {% endfor %}
-                    </p>
-                {% endif %}
+                {% include plugins/i18n.html %}
                 {{ content | extlinks }}
             </article>
         </div>
         <section class="author-detail">
-            {% if page.comments.disqus or page.comments.waline %}
-            <section class="post-footer-item comment">
-                <div class="comments-headline">
-                    <svg class="icon" aria-hidden="true">
-                    <use xlink:href="#icon-comment"></use>
-                    </svg>
-                    <span>评论</span>
-                </div>
-                {% if page.comments.disqus and page.comments.waline %}
-                <div id="comments-switch">
-                    <span class="first-comment">Disqus</span>
-                    <span class="switch-button">
-                    <input id="cmn-toggle-4" class="cmn-toggle cmn-toggle-round-flat" type="checkbox">
-                    <label for="cmn-toggle-4"></label>
-                    </span>
-                    <span class="second-comment">Waline</span>
-                </div>
-                {% endif %}
-            </section>      
-            {% endif %}
-            
-            {% if page.comments.disqus %}
-            <section class="post-footer-item comment">
-                <div id="disqus_thread"></div>
-            </section>
-            {% endif %}
-            
-            {% if page.comments.waline %}
-            <section class="post-footer-item comment">
-                <div id="waline"></div>
-            </section>
-            {% endif %}
+            {% include plugins/comments/comments_block.html %}
         </section>
     </div>
-
-    {% include sidebar.html %}
-
-</main>
-
-
-
-{% include footer.html %}
+    {% include layouts/sidebar.html %}
+</main>