taletype 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cbdae39e8dcf1cab7996327e34dc236fe3d58fc06bc30e19732db68c197977
-  data.tar.gz: ee88312cd663e7f19dd22792ab434fc3d00bbd4f4332b2ba98be95c2a91d43e5
+  metadata.gz: d57ea908a282d0a89070913679d61dcba659d14b8badf326387e275afed63194
+  data.tar.gz: eb2e742a481bf0ed3ee1afdc70b8a4613fdec066f0591b2d9158904031df4381
 SHA512:
-  metadata.gz: 23fbb70d43ccca85c91ee216eab5a39574024db1acd494813a3ba21f474ee3c2339cec1de747663ebb518f2f71fab15c7394c1b291de690b93f749b4828164e4
-  data.tar.gz: 15f60a6349a57e5a07fe0e70debddbaacf3675580ae371f33178753f736e5717db05f68f63e43a4dc60c70d118239da5c24198fb84980a87416b51d6ac01a176
+  metadata.gz: 9842fa4c0d311892e8156e0ed94b7d4c5c4137486b84f6a44941e9ad8d97fd1114b9ffd5103a7d66daeb8a339cff10d7bdc555d4943231298a38f3a9f53971cc
+  data.tar.gz: 3a14745e771e8e3e7971bc324a49759d7f8606fb9f40576cf9681a6639bfa434a980e6c4be62cac35eb8ec7b12fe492699080594426422f9e100ebbde52504f6

data/_includes/comments.html

@@ -0,0 +1,38 @@
+
+<div class="commentation" onload="onSelectGiscus()">
+	<div>对我博客最大的鼓励来自于你的评论，欢迎选择
+		<button id="giscus-btn" onclick="onSelectGiscus()" class="active">giscus</button>
+		或
+		<button id="disqus-btn" onclick="onSelectDisqus()">disqus</button>
+		来回复，
+		也可以在 <a href="https://github.com/{{ site.giscus.repo }}/discussions/{{ page.gh_discussion }}" target="_blank">GitHub discussion</a> 留言。
+	</div>
+
+	<br />
+
+	<div id="giscus-tab" style="display:block">
+		{% include giscus_comments.html %}
+	</div>
+	<div id="disqus-tab" style="display:none">
+		{% include disqus_comments.html %}
+	</div>
+</div>
+
+<script type="text/javascript">
+	var giscusBtn = document.querySelector('#giscus-btn');
+	var disqusBtn = document.querySelector('#disqus-btn')
+	var giscusTab = document.querySelector('#giscus-tab');
+	var disqusTab = document.querySelector('#disqus-tab')
+    function onSelectGiscus() {
+		giscusBtn.classList.add('active');
+		disqusBtn.classList.remove('active');
+		giscusTab.style.display = "block";
+		disqusTab.style.display = "none";
+	}
+	function onSelectDisqus() {
+		giscusBtn.classList.remove('active');
+		disqusBtn.classList.add('active');
+		giscusTab.style.display = "none";
+		disqusTab.style.display = "block";
+	}
+</script>

data/_includes/disqus_comments.html

@@ -1,11 +1,21 @@
 <!-- Start disqus -->
-<script src="{{ "/assets/js/disqusLoader.js" | relative_url }}" /></script>
-<div id="disqus_thread"><h3>Discussion and feedback</h3></div>
-<div class="disqus"></div>
+<div id="disqus_thread"></div>
 <script>
-    disqusLoader('.disqus', {
-        scriptUrl: 'https://{{ site.disqus }}.disqus.com/embed.js'
-    });
+    /**
+    *  RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES FROM YOUR PLATFORM OR CMS.
+    *  LEARN WHY DEFINING THESE VARIABLES IS IMPORTANT: https://disqus.com/admin/universalcode/#configuration-variables    */
+    /*
+    var disqus_config = function () {
+    this.page.url = PAGE_URL;  // Replace PAGE_URL with your page's canonical URL variable
+    this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
+    };
+    */
+    (function() { // DON'T EDIT BELOW THIS LINE
+    var d = document, s = d.createElement('script');
+    s.src = 'https://{{ site.disqus }}.disqus.com/embed.js';
+    s.setAttribute('data-timestamp', +new Date());
+    (d.head || d.body).appendChild(s);
+    })();
 </script>
 <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 <!-- End disqus -->

data/_includes/giscus_comments.html

@@ -0,0 +1,15 @@
+<!-- https://giscus.app/ -->
+<script src="https://giscus.app/client.js"
+data-repo="{{ site.giscus.repo }}"
+data-repo-id="{{ site.giscus.repo_id }}"
+data-category="{{ site.giscus.category }}"
+data-category-id="{{ site.giscus.category_id }}"
+data-mapping="pathname"
+data-reactions-enabled="1"
+data-emit-metadata="0"
+data-input-position="bottom"
+data-theme="light"
+data-lang="en"
+crossorigin="anonymous"
+async>
+</script>

data/_includes/gitalk_comments.html

@@ -2,8 +2,10 @@
 <!-- https://github.com/geektutu/hexo-theme-geektutu/blob/master/layout/_widget/comments.ejs#L31 -->
 <!-- ref: https://geektutu.com/post/blog-experience-7.html -->
 
+<div>欢迎留言，请在下面评论框或直接在 <a href="https://github.com/{{ site.gitalk.owner }}/{{ site.gitalk.repo }}/issues/{{ page.gh_issue }}" target="_blank">GitHub issue</a> 评论。</div>
+
 <!-- Start gitalk -->
-<script src="{{ "/assets/js/gitalk.min.js" | relative_url }}" /></script>
+<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 class="gt-container text-center" style="margin-top: 50px;">

data/_layouts/page.html

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

data/_layouts/post.html

@@ -23,14 +23,12 @@ layout: default
 
 <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' %}
-  {% include gitalk_comments.html %}
-{% else %}
-{% endif %}
+<div>本文采用<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/deed.zh">「CC BY-SA 4.0」</a>知识共享许可协议，如果还喜欢其他文章， 
+欢迎<a href="/subscription">订阅“胡涂说”博客</a>。
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="知识共享许可协议" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" /></a>
+</div>
+
+{% include comments.html %}
 
 <div class="pagination">
   {% if page.next.url %}

data/_sass/tale/_commentation.scss

@@ -0,0 +1,13 @@
+.commentation {
+  border-top: .5px solid $grey-2;
+  font-family: $serif-secondary;
+  padding-top: 2rem;
+  margin-top: 1rem;
+  position: relative;
+  text-align: center;
+
+  .active, .btn:hover {
+    background-color: #666;
+    color: white;
+  }
+}

data/_sass/tale.scss

@@ -8,6 +8,7 @@
 @import 'tale/layout';
 @import 'tale/pagination';
 @import 'tale/catalogue';
+@import 'tale/commentation';
 
 @import 'vendor/gitalk';
 @import 'vendor/gitalk-plus';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taletype
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - hutusi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -106,8 +106,10 @@ files:
 - _includes/analytics.html
 - _includes/baidu_statistic.html
 - _includes/cnzz_statistic.html
+- _includes/comments.html
 - _includes/disqus_comments.html
 - _includes/footer.html
+- _includes/giscus_comments.html
 - _includes/gitalk_comments.html
 - _includes/head.html
 - _includes/image.html
@@ -124,6 +126,7 @@ files:
 - _sass/tale/_base.scss
 - _sass/tale/_catalogue.scss
 - _sass/tale/_code.scss
+- _sass/tale/_commentation.scss
 - _sass/tale/_layout.scss
 - _sass/tale/_pagination.scss
 - _sass/tale/_post.scss
@@ -161,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: TaleType(Tale redistributed) is a minimal Jekyll theme curated for storytellers.