taletype 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec5d20203e5f77694e336a2f0260f050ee3632e8213582201cb841225556671
-  data.tar.gz: b00eb38e5dc2c0ad98000f41262dd6c8bf28a1a63ee8f545e2c93aee5e782476
+  metadata.gz: 8d3e085454faf5fc1c02eb6c4c38b237d7ae59952a2d60d0aaab9d52fdf6af76
+  data.tar.gz: 2df637177bd2d7684ec216646646cc1cf0a873a7da21a8a1e3a77c7e5039d375
 SHA512:
-  metadata.gz: c4fb23ddb319fcd2f00172e8f53e08e5b505452781baeb915fbf021aef6922dca9c8c22bccce42053e46252129fa6343d106e6cebd651cf09fa57c8a60bd19f4
-  data.tar.gz: 58faa2a81e590efc7c87e94e5efc1f54ed325a748de1308e0f51ef459eb8a981efdfe902359feb21667dab425f5c6a8cc335d816216260d37a5195d6ed8abea4
+  metadata.gz: 7a896b161bae4a1ebca089611c9b8c53e2517200fd073586a940a60115d6958a5b6403d545510aa12d10f54fdad7e2e0c6451662b21083074af1675a20dbe061
+  data.tar.gz: eac39d1a39f0d8db5e49a72e9142e900eb23acd8df52e5fbb09558544b90fd19500d698bcbe437f7f65930884ccdb9dba32f2b6180fd215a1ee9486c8db9094b

data/_includes/baidu_statistic.html

@@ -0,0 +1,21 @@
+<script>
+  var _hmt = _hmt || [];
+  (function() {
+    var hm = document.createElement("script");
+    hm.src = "https://hm.baidu.com/hm.js?{{ site.baidu_statistic }}";
+    var s = document.getElementsByTagName("script")[0]; 
+    s.parentNode.insertBefore(hm, s);
+  })();
+</script>
+
+<!-- baidu auto push for seo -->
+<script>
+  window.addEventListener('load', function () {
+      var src = 'http://push.zhanzhang.baidu.com/push.js'
+      var curProtocol = window.location.protocol.split(':')[0];
+      if (curProtocol === 'https') {
+          src = 'https://zz.bdstatic.com/linksubmit/push.js';
+      }
+      globalAddScript(src);
+  })
+</script>

data/_includes/cnzz_statistic.html

@@ -0,0 +1,5 @@
+<div>
+  <center>
+    <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_{{ site.cnzz_statistic }}'%3E%3C/span%3E%3Cscript src='https://s4.cnzz.com/z_stat.php%3Fid%3D{{ site.cnzz_statistic }}%26show%3Dpic' type='text/javascript'%3E%3C/script%3E"));</script>
+  </center>
+</div>

data/_includes/footer.html

@@ -1,6 +1,43 @@
 <footer>
   <span>
-    &copy; <time>{{ site.time | date: '%Y' }}</time> {{ site.copyright }}  {{ site.icp_info }} <br />
-    Made with Jekyll using the <a href="https://github.com/hutusi/tale/" target="_blank">TaleType</a> theme.
+    &copy; <time>{{ site.time | date: '%Y' }}</time> {{ site.copyright }} <br />
+    <a href="https://beian.miit.gov.cn/" target="_blank">{{ site.icp_info }}</a><br />
+    Made with Jekyll using the <a href="https://github.com/hutusi/tale/" target="_blank">TaleType</a> theme, 
+    CDN for images sponsored by <a href="https://www.dogedoge.com/" target="_blank">多吉搜索</a>
+    <br />
   </span>
+
+  
+  <div class="busuanzi-count">
+    <script async src="//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js"></script>
+
+    <span class="post-meta-item" id="busuanzi_container_site_uv" style="display: none;">
+      <span class="post-meta-item-icon">
+        <i class="fa fa-user">UV </i>
+      </span>
+      <span class="site-uv" title="总访客量">
+        <span id="busuanzi_value_site_uv"></span>
+      </span>
+    </span>
+    <span class="post-meta-divider">|</span>
+    <span class="post-meta-item" id="busuanzi_container_site_pv" style="display: none;">
+      <span class="post-meta-item-icon">
+        <i class="fa fa-eye">PV </i>
+      </span>
+      <span class="site-pv" title="总访问量">
+        <span id="busuanzi_value_site_pv"></span>
+      </span>
+    </span>
+  </div>
+
+  <!-- Baidu Statistic-->
+  {% if site.baidu_statistic %}
+    {% include baidu_statistic.html %}
+  {% endif %}
+
+  <!-- cnzz Statistic-->
+  {% if site.cnzz_statistic %}
+    {% include cnzz_statistic.html %}
+  {% endif %}
+
 </footer>

data/_includes/gitalk_comments.html

@@ -1,19 +1,88 @@
+<!-- ref: gitalk -->
+<!-- https://github.com/geektutu/hexo-theme-geektutu/blob/master/layout/_widget/comments.ejs#L31 -->
+<!-- ref: https://geektutu.com/post/blog-experience-7.html -->
+
 <!-- Start gitalk -->
-<script src="{{ "/assets/js/gitalk.min.js" | relative_url }}" /></script>
-<div id="disqus_thread"><h3>Discussion and feedback</h3></div>
-<div id="gitalk-container"></div>
+{% assign cache_bust = site.time | date:'?v=%s' %}
+<script src="{{ "/assets/js/gitalk.min.js" | relative_url | append: cache_bust }}" /></script>
+<!-- <div id="disqus_thread"><h3>Discussion and feedback</h3></div> -->
+<div id="gitalk-container">
+    <div class="gt-container text-center" style="margin-top: 50px;">
+        <button class="gt-btn gt-btn-public"><span class="gt-btn-text">去 Github 评论</span></button>
+    </div>
+</div>
+
+<div id="gitalk-related"></div>
+
 <script>
-    const gitalk = new Gitalk({
-        clientID: '{{ site.gitalk.client_id }}',
-        clientSecret: '{{ site.gitalk.client_secret }}',
-        repo: '{{ site.gitalk.repo }}',
-        owner: '{{ site.gitalk.owner }}',
-        admin: '{{ site.gitalk.admin }}',
-        id: location.pathname,      // Ensure uniqueness and length less than 50
-        distractionFreeMode: false  // Facebook-like distraction free mode
-    })
+    window.addEventListener('load', function () {
+        function renderCommentUrl(data) {
+            var url = (data[window.location.pathname] || {}).url
+            url && getDom('#gitalk-container button').addEventListener('click', function (e) { window.open(url)})
+            url || (getDom('#gitalk-container').style.display = 'none')
+        }
+        function getDom(str) { return document.querySelector(str) }
+
+        const gitalk = new Gitalk({
+            clientID: '{{ site.gitalk.client_id }}',
+            clientSecret: '{{ site.gitalk.client_secret }}',
+            repo: '{{ site.gitalk.repo }}',
+            owner: '{{ site.gitalk.owner }}',
+            admin: '{{ site.gitalk.admin }}',
+            id: location.pathname,      // Ensure uniqueness and length less than 50
+            distractionFreeMode: false  // Facebook-like distraction free mode
+        })
 
-    gitalk.render('gitalk-container')
+        fetch("https://api.github.com/user").then(function(resp){
+            gitalk.render('gitalk-container');
+        }).catch(function(e){
+            fetch('/assets/data/issues.json').then(function (r) { return r.json() }).then(renderCommentUrl).catch(function (e) { })
+        })
+        getDom('#gitalk-container').addEventListener('click', function (e) {
+            e && e.stopPropagation && e.stopPropagation();
+        });
+    })
 </script>
 <noscript>Please enable JavaScript to view the <a href="https://gitalk.github.io/">comments powered by gitalk.</a></noscript>
 <!-- End gitalk -->
+
+<!-- gitalk plus -->
+<script>
+    window.addEventListener('load', function () {
+        function render(comments) {
+            var template = '<a href="${comment.url}?utm_source=gitalk" class="dis-item-url"><h3 class="dis-item-title">${comment.title}</h3>' +
+                '<p class="dis-item-des">${comment.count} 评论 ● ${comment.date}</p>' +
+                '<div class="dis-item-content"><img class="dis-item-img" src="${comment.icon}" alt="icon"><p><b><span class="dis-item-user">${comment.user}</span></b>&nbsp;——&nbsp;${comment.body}</p></div>' +
+                '</a>'
+
+            var wrapper = getDom('#gitalk-related');
+            comments = shuffle(comments);
+            comments.slice(0, 4).forEach(function (c) {
+                var div = document.createElement('div');
+                div.classList.add('dis-item');
+                div.innerHTML = template.replace("${comment.url}", c.url)
+                    .replace("${comment.title}", c.title)
+                    .replace("${comment.count}", c.count)
+                    .replace("${comment.date}", c.date)
+                    .replace("${comment.icon}", c.icon)
+                    .replace("${comment.user}", c.user)
+                    .replace("${comment.body}", c.body)
+                wrapper.appendChild(div)
+            })
+            var p = document.createElement('p')
+            p.innerHTML = '<a href="https://geektutu.com/post/blog-experience-7.html">Gitalk Plus</a>';
+            p.classList.add('dis-divide');
+            wrapper.appendChild(p);
+            wrapper.classList.add('dis-wrapper')
+        }
+        function shuffle(a) {
+            for (var i = a.length - 1; i > 0; i--) {
+                var j = Math.floor(Math.random() * (i + 1));
+                [a[i], a[j]] = [a[j], a[i]];
+            }
+            return a;
+        }
+        function getDom(str) { return document.querySelector(str) }
+        fetch('/assets/data/comments.json').then(function (r) { return r.json() }).then(render).catch(function (e) { })
+    })
+</script>

data/_includes/head.html

@@ -3,9 +3,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   {% seo %}
-
+  
   <!-- CSS -->
-  <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
+  {% assign cache_bust = site.time | date:'?v=%s' %}
+  <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url | append: cache_bust }}">
   <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Libre+Baskerville:400,400i,700"> -->
 
   <!-- Favicon -->
@@ -17,7 +18,10 @@
   {% feed_meta %}
 
   <!-- Google Analytics-->
-  {% if site.google_analytics and jekyll.environment == 'production' %}
-  {% include analytics.html %}
+  {% if site.google_analytics %}
+    {% include analytics.html %}
   {% endif %}
+
+  <!-- Google AdSense-->
+  <script data-ad-client="{{ site.google_adsense }}" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 </head>

data/_includes/image.html

@@ -0,0 +1,6 @@
+<!-- usage: {% include image.html file="img.jpg" caption="Image caption" %} -->
+
+<figure>
+  <img src="{{site.url}}/{{page.img_path}}/{{ include.file }}" alt="{{ include.caption}}">  
+  <figcaption>{{ include.caption }}</figcaption>
+</figure>

data/_includes/navigation.html

@@ -5,19 +5,29 @@
     </a>
 
     <ul>
-      {% for page in site.pages %}
-        {% unless page.name == '404.md' %}
-          {% if page.title %}
+      {%- for page_name in site.nav_page_names -%}
+        {%- for page in site.pages -%}
+
+          {%- if page.title and page.name == page_name -%}
+
             <li class='nav-item' role='presentation'>
               <a class='nav-link' href='{{ page.url | prepend: site.baseurl }}'>{{ page.title }}</a>
             </li>
-          {% endif %}
-        {% endunless %}
-      {% endfor %}
 
-      <li class='nav-item' role='presentation'>
-        <a class='nav-link' href='{{ site.baseurl }}/feed.xml' target='_blank'>Feed</a>
-      </li>
+          {%- endif -%}
+
+        {%- endfor -%}
+      {%- endfor -%}
+
+      {% if site.nav_feed == 'feeds.pub' %}
+        <li class='nav-item hidden-mobile' role='presentation'>
+          <a class='nav-link' href="https://feeds.pub/feed/https%3A%2F%2Fhutusi.com%2Ffeed.xml" target='_blank'><div class="center"><img src="https://img.shields.io/badge/dynamic/json?label=follow&query=%24.data.feed.followerCount&url=https%3A%2F%2Fapi.feeds.pub%2Fgraphql%3Fquery%3Dquery%2520feed%28%2524id%253A%2520String%21%29%257B%2520feed%28id%253A%2520%2524id%29%2520%257B%2520followerCount%2520%257D%2520%257D%26variables%3D%257B%2522id%2522%253A%2520%2522https%3A%2F%2Fhutusi.com%2Ffeed.xml%2522%257D%26operationName%3Dfeed&style=social&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEUAAABFCAYAAAAcjSspAAAACXBIWXMAAAInAAACJwG+ElQIAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAASkSURBVHgB7Ztdcts2EMf/oDyeNO5MnBOUN4hzAtNvrZ0H8QSimwPEPoHlE9g5gZkTSJ46mU77YPYEVd/6yN5AnWkzrVNxuxAhN3UA0YL46eA3Y30AkDT8c7FY7MKAw+FwlIfAAyAafe2rl/w8m8bhjxOsQedEiUbBNrAVeQLPCBTwJfiaYROiWRiH36ewYAMdIBfiUV+I3oDfBrKN5j3Ge7rDYy/4eQ8WtFoUOS08zxsQiSN+u73ap7EDS1opCosR8J0+4ZcBEWyZwpJWiRKN9tnsxRnUFFkHIjqFJa1wtNJneN7WCVvFEexgqyD+E1MBkWaUXcbhuxiWNC7Ky8sXrzKiIVbzGVO2hDeANwb+mMRhYj1VdDQmytw6xJcXvKz2V/hYwk73NA6vElRII6Io3zHCPNgqhK1CvGaLOC/bIkzU7mij0TccbwgZQxRNl9rFWFCrpby8PBhkhLhoHPsLFuP9sG4xFtQmioo9rguGcXgujqv2GUX0UAMyMmVBpA8xThllHYdx+MOvaJhafIqyEN/Qzb7DY+v4LkZLqFwUFYf4hm4Zb+yxIGtt9cumUp+ipo3RSliQ5xx5tkoQiYdK8QIYBcFxGwWRVCoKxyMnhi4Ozd+eo6VUJopKEfq6PqKbQ7SYCh3txs4iP3aHqRCbZ4fjA16eSS3RIp0/CkyyjH4BssQ2lVgGFYqS7Rj8uBQiyF/e9vvygf0MB3iyrYdvxwdxRrPTJsSpZPrkq47YxRqwjUW8cv0sN4+omdJFkXGJvBiUkD1jtlnc649KGLVQ2vTJ8yOPzzhQi1AuPN08mZGzzcqtTCmWIgURYuuaICJUAFvLADWydkS7EAT3LClwFPsT3wuOUbIU2OTUwI20BOl85WrEuRYM9J/782lnkkwq4XxvZ8h3/auL/tXY0D0+HO/v6qp+vc3HT7BG2WIV1po+vDJEFhl4P6/4mRDaC5/dfHiKmlhLlCVhvIw5ONtOqb73i0DXGo36UiyD1X1IURPWokgrgXn3+5r3NlHuPzQ/anCcPe8fk0NN60xNWouyxEr4At6pKSUS3QBepYK7U0jGIqr+oxmPBDViJYqKMn1dH+dYP9rsbUqHqrvD84rgf993m3fR+xoSb1AjVktyNDo44qXzTNM1uei/ff7/sfvnbFWvdN8jRG4ZBacKEv5OqyMVtlgtyewTdkmzAybKNHc045ikpxWFxRiiAKJZ7WkGq+lDt1v+u/Q+yaTJXW5e1LL4nXl2rjO7ZFMi+m/DCrEx5IcUq/zCvGbcTHbOUhTh61pNB/DicMxZ+5n0CynuQW4hV0M0xMqiqABLx9I4Ip9Gsz1ejsdLhiV5hr/Z/K2Fo/1r21BYLAyulH8Io9GLgB2wLLQ/ExzWZ5T9Js+aNF0uXdDI8S518Qlaio1P8Q3tKR4IFRfDuokTRYONKKmh3ccDwVmKBieKBieKBgtRHpmCtKLTjp1hZVHkPsbQ9fmK8jlgK4rWWpaXLrqDbT5FK4oqWHUeN300OFE0OFE02KYjU13r7Ob973gA2GXziY5xZwXKE83N/NdF2VifT8mPXHlHXAN6knEFry2pRIfD4XA4usm//qauBcoh1b8AAAAASUVORK5CYII=" alt="Follow on Feeds Pub"/></div></a>
+        </li>
+      {% elsif site.nav_feed == 'xml' %}
+        <li class='nav-item hidden-mobile' role='presentation'>
+          <a class='nav-link' href='{{ site.baseurl }}/feed.xml' target='_blank'>Feed</a>
+        </li>
+      {% endif %}
     </ul>
   </div>
 </nav>

data/_includes/tag_cloud.html

@@ -0,0 +1,12 @@
+<!-- ref: https://longqian.me/2017/02/09/github-jekyll-tag/ -->
+{% capture temptags %}
+  {% for tag in site.tags %}
+    {{ tag[1].size | plus: 1000 }}#{{ tag[0] }}#{{ tag[1].size }}
+  {% endfor %}
+{% endcapture %}
+{% assign sortedtemptags = temptags | split:' ' | sort | reverse %}
+{% for temptag in sortedtemptags %}
+  {% assign tagitems = temptag | split: '#' %}
+  {% capture tagname %}{{ tagitems[1] }}{% endcapture %}
+  <a href="/tag/{{ tagname }}">{{ tagname }}</a>
+{% endfor %}

data/_layouts/archive.html

@@ -0,0 +1,13 @@
+---
+layout: default
+---
+
+<h2>Archive of posts with {{ page.type }} '{{ page.title }}'</h2>
+<ul class="posts">
+  {% for post in page.posts %}
+    <li>
+      <span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span>
+      <a class="post-link" href="{{ post.url | relative_url }}">{{ post.title }}</a>
+    </li>
+  {% endfor %}
+</ul>

data/_layouts/home.html

@@ -21,10 +21,10 @@ layout: default
 
 <div class="pagination">
   {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path | prepend: site.baseurl }}" class="left arrow">&#8592;</a>
+    <a href="{{ paginator.previous_page_path | prepend: site.baseurl }}" class="left arrow">&#8592; 上一页</a>
   {% endif %}
   {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path | prepend: site.baseurl }}" class="right arrow">&#8594;</a>
+    <a href="{{ paginator.next_page_path | prepend: site.baseurl }}" class="right arrow">下一页 &#8594;</a>
   {% endif %}
 
   <span>{{ paginator.page }}</span>

data/_layouts/page.html

@@ -9,8 +9,15 @@ layout: default
   {{ content }}
 </div>
 
-{% if page.comments %}
-  {% include disqus_comments.html %}
+{% if page.commentable %}
+
+  {% if site.comments_engine == 'disqus' %}
+    {% include disqus_comments.html %}
+  {% elsif site.comments_engine == 'gitalk' %}
+    {% include gitalk_comments.html %}
+  {% else %}
+  {% endif %}
+
 {% endif %}
 
 <div class="pagination">

data/_layouts/post.html

@@ -4,6 +4,7 @@ layout: default
 
 <div class="post">
   <h1 class="post-title">{{ page.title }}</h1>
+  <h2 class="post-subtitle">{{ page.subtitle }}</h2>
 
   <div class="post-info">
     {% if page.date %}
@@ -20,6 +21,10 @@ layout: default
   {% endfor %}
 </div>
 
+<br />
+
+<div>欢迎<a href="/subscription">订阅“胡涂说”博客</a>；欢迎留言，请在下面评论框或直接在 <a href="https://github.com/{{ site.gitalk.owner }}/{{ site.gitalk.repo }}/issues/{{ page.gh_issue }}" target="_blank">GitHub issue</a> 评论。</div>
+
 {% if site.comments_engine == 'disqus' %}
   {% include disqus_comments.html %}
 {% elsif site.comments_engine == 'gitalk' %}
@@ -36,4 +41,7 @@ layout: default
   {% endif %}
 
   <a href="#" class="top">Top</a>
-</div>
+</div>
+
+<!-- Go to www.addthis.com/dashboard to customize your tools -->
+<script async type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-4fa6932104ee5f3f"></script>

data/_layouts/tag-archive.html

@@ -0,0 +1,17 @@
+---
+layout: default
+---
+
+<h2>{{ page.title }}</h2>
+<ul>
+{% for post in page.posts %}
+  <!-- <li><a href="{{ post.url }}">{{ post.title }}</a> ({{ post.date | date_to_string }} | Tags: {{ post.tags | array_to_sentence_string: "" }})</li> -->
+  <li><a href="{{ post.url }}">{{ post.title }}</a> ({{ post.date | date_to_string }})</li>
+{% endfor %}
+</ul>
+
+<h2>All tags</h2>
+
+<div id="tag-cloud" class='tags'>
+  {% include tag_cloud.html %}
+</div>

data/_sass/tale.scss

@@ -10,3 +10,4 @@
 @import 'tale/catalogue';
 
 @import 'vendor/gitalk';
+@import 'vendor/gitalk-plus';

data/_sass/tale/_base.scss

@@ -64,3 +64,13 @@ img {
 td {
   vertical-align: top;
 }
+
+@media (max-width: 600px) {
+  .hidden-mobile {
+    visibility: hidden;
+    display: none;
+    clear: both;
+    float: left;
+    width: 100%;
+  }
+}

data/_sass/tale/_layout.scss

@@ -58,6 +58,11 @@ footer,
     &:focus {
       opacity: 1;
     }
+
+    .center {
+      height: 15px;
+      position: relative;
+    }
   }
 
   a {

data/_sass/tale/_post.scss

@@ -26,6 +26,13 @@
     text-align: center;
   }
 
+  &-subtitle {
+    color: $default-shade;
+    font-family: $serif-secondary;
+    font-size: 18px;
+    text-align: center;
+  }
+
   &-line {
     border-top: 0.4rem solid $default-shade;
     display: block;

data/_sass/vendor/_gitalk-plus.scss

@@ -0,0 +1,76 @@
+/* https://gist.github.com/geektutu/f379d87767787979507a0e4a20da64ba */
+
+#gitalk-related.dis-wrapper {
+  font-size: 14px;
+  margin: 70px 0;
+  overflow: hidden;
+  padding-bottom: 10px;
+}
+
+#gitalk-related * {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  text-decoration: none;
+  transform: none;
+  -webkit-transform: none;
+}
+
+#gitalk-related .dis-divide {
+  border-top: 2px solid #e7e9ee;
+  width: 100%;
+  float: left;
+  padding: 5px 10px;
+  margin-top: 20px;
+  text-align: center;
+}
+
+#gitalk-related .dis-item {
+  width: 50%;
+  float: left;
+  padding: 0px 10px;
+  margin-top: 20px;
+  height: 108px;
+  overflow: hidden;
+}
+
+#gitalk-related .dis-item-title {
+  font-size: 16px;
+  color: #6190e8;
+  font-weight: 500;
+  max-height: 3em;
+  line-height: 1.5;
+  overflow: hidden;
+}
+
+#gitalk-related .dis-item-des {
+  font-size: 0.85em;
+}
+
+#gitalk-related .dis-divide a,
+#gitalk-related .dis-item-des,
+#gitalk-related .dis-item-user {
+  color: rgba(30, 55, 70, .4);
+}
+
+#gitalk-related .dis-item-img {
+  width: 30px;
+  height: 30px;
+  margin-top: 3px;
+}
+
+#gitalk-related .dis-item-content {
+  display: flex;
+}
+
+#gitalk-related .dis-item-content>p {
+  padding-left: 10px;
+  color: #333;
+  line-height: 1.4em;
+  max-height: 4.2em;
+  overflow: hidden;
+}
+
+.text-center {
+  text-align: center !important;
+}