jekyll-text-theme 1.4.3 → 1.5.0

data/_includes/snippets/get-lang.html

@@ -1,6 +1,6 @@
-{%- assign __return = '' -%}
+{%- assign __return = site.data.variables.default.lang -%}
 {%- if page.lang -%}
   {%- assign __return = page.lang -%}
-{%- else -%}
+{%- elsif site.lang -%}
   {%- assign __return = site.lang -%}
 {%- endif -%}

data/_includes/snippets/get-sources.html

@@ -0,0 +1,5 @@
+{%- assign _sources = site.data.variables.default.sources -%}
+{%- if site.sources -%}
+  {%- assign _sources = site.sources -%}
+{%- endif -%}
+{%- assign __return = site.data.variables.sources[_sources] -%}

data/_includes/utils/chart.html

@@ -0,0 +1,17 @@
+{%- if site.chart == true or page.chart == true -%}
+{%- include snippets/get-sources.html -%}
+{%- assign _sources = __return -%}
+<script>
+  window.Lazyload.js(['{{ _sources.jquery }}', '{{ _sources.chart }}'], function() {
+    var $canvas = null, $this = null, _ctx = null, _text = '';
+    $('.language-chart').each(function(){
+      $this = $(this);
+      $canvas = $('<canvas></canvas>');
+      _text = $this.text();
+      $this.text('').append($canvas);
+      _ctx = $canvas.get(0).getContext('2d');
+      (_ctx && _text) && (new Chart(_ctx, JSON.parse(_text)) && $this.attr('data-processed', true));
+    });
+  });
+</script>
+{%- endif -%}

data/_includes/utils/comment-disqus.html

@@ -1,16 +1,13 @@
 {%- if site.disqus.shortname and page.key -%}
     <div id="disqus_thread"></div>
     <script>
-
     /**
     *  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 = '{%- include snippets/page-url.html -%}';
         this.page.identifier = '{{ page.key }}';
     };
-
     (function() { // DON'T EDIT BELOW THIS LINE
         var d = document, s = d.createElement('script');
         s.src = 'https://{{ site.disqus.shortname }}.disqus.com/embed.js';

data/_includes/utils/comment-gitalk.html

@@ -1,22 +1,25 @@
 {%- if site.disqus.shortname == nil and site.gitalk.clientID and site.gitalk.clientSecret and site.gitalk.repository and site.gitalk.owner and site.gitalk.admin and page.key -%}
-	<link rel="stylesheet" href="//unpkg.com/gitalk/dist/gitalk.css">
-	<div id="js-gitalk-container"></div>
-  {%- assign admin = '' -%}
-  {%- for adminId in site.gitalk.admin -%}
-    {%- assign admin = admin | append: ", '" | append: adminId | append: "'" -%}
-  {%- endfor -%}
-  {%- assign last = admin | size | minus: 1 -%}
-  {%- assign admin = admin | slice: 2, last -%}
-	<script src="//unpkg.com/gitalk/dist/gitalk.min.js"></script>
-	<script>
+{%- include snippets/get-sources.html -%}
+{%- assign _sources = __return -%}
+<div id="js-gitalk-container"></div>
+{%- assign admin = '' -%}
+{%- for adminId in site.gitalk.admin -%}
+	{%- assign admin = admin | append: ", '" | append: adminId | append: "'" -%}
+{%- endfor -%}
+{%- assign last = admin | size | minus: 1 -%}
+{%- assign admin = admin | slice: 2, last -%}
+<script>
+	window.Lazyload.css('{{ _sources.gitalk.css }}');
+	window.Lazyload.js('{{ _sources.gitalk.js }}', function() {
 		var gitalk = new Gitalk({
 			clientID: '{{ site.gitalk.clientID }}',
 			clientSecret: '{{ site.gitalk.clientSecret }}',
 			repo: '{{ site.gitalk.repository }}',
 			owner: '{{ site.gitalk.owner }}',
 			admin: [{{ admin }}],
-      id: '{{ page.key }}'
+			id: '{{ page.key }}'
 		});
 		gitalk.render('js-gitalk-container');
-	</script>
+	});
+</script>
 {%- endif -%}

data/_includes/utils/google-analytics.html

@@ -1,13 +1,11 @@
 {%- if site.ga_tracking_id -%}
-<!-- Google Analytics -->
 <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '{{ site.ga_tracking_id }}', 'auto');
-    ga('send', 'pageview');
+	ga('create', '{{ site.ga_tracking_id }}', 'auto');
+	ga('send', 'pageview');
 </script>
-<!-- End Google Analytics -->
 {%- endif -%}

data/_includes/utils/mathjax.html

@@ -1,8 +1,14 @@
 {%- if site.mathjax == true or page.mathjax == true -%}
+{%- include snippets/get-sources.html -%}
+{%- assign _sources = __return -%}
 <script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-        tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
-    });
+	var _config = { tex2jax: {
+		inlineMath: [['$','$'], ['\\(','\\)']]
+	}};
+	{%- if site.mathjax_autoNumber == true or page.mathjax_autoNumber == true -%}
+		_config.TeX = { equationNumbers: { autoNumber: "all" } };
+	{%- endif -%}
+	MathJax.Hub.Config(_config);
 </script>
-<script type="text/javascript" async src="//cdn.bootcss.com/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+<script type="text/javascript" src="{{ _sources.mathjax }}" async></script>
 {%- endif -%}

data/_includes/utils/mermaid.html

@@ -1,9 +1,10 @@
 {%- if site.mermaid == true or page.mermaid == true -%}
-<script src="//cdn.bootcss.com/mermaid/7.1.2/mermaid.min.js"></script>
+{%- include snippets/get-sources.html -%}
+{%- assign _sources = __return -%}
 <script>
-  mermaid.init(undefined, '.language-mermaid');
-  $(function() {
-      mermaid.initialize({ startOnLoad: true });
+  window.Lazyload.js('{{ _sources.mermaid }}', function() {
+    mermaid.init(undefined, '.language-mermaid');
+    mermaid.initialize({ startOnLoad: true });
   });
 </script>
 {%- endif -%}

data/_layouts/all.html

@@ -1,141 +1,20 @@
 ---
-layout: blog-default
+layout: base
 titles:
   en: All Posts
   zh: 归档
   zh-Hans: 归档
   zh-Hant: 歸檔
 ---
-<div class="m-all">
+<div class="m-all js-all">
   <div class="main">
-    {%- include snippets/page-title.html -%}
-    <h1 class="js-page-heading">{{ __return }}</h1>
-    {%- include blog/tags.html -%}
+    <div class="m-search-box js-search-box">
+      <div class="icon-search">{%- include icon/search.svg -%}</div>
+      <input type="text" />
+      <div class="icon-clear">{%- include icon/clear.svg -%}</div>
+    </div>
+    {%- include components/tags.html -%}
     <!--group by year: http://stackoverflow.com/questions/19086284/jekyll-liquid-templating-how-to-group-blog-posts-by-year-->
-    <section class="js-year-wrapper">
-      {%- for post in site.posts -%}
-        {%- assign currentdate = post.date | date: '%Y' -%}
-        {%- if currentdate != date -%}
-          {%- unless forloop.first -%}</ul></section>{%- endunless -%}
-          <section id="{{ post.date | date: "%Y" }}">
-          <h2 class="year-title" id="year-{{ post.date | date: "%Y" }}">{{ currentdate }}</h2>
-          <ul class="year-list">
-          {%- assign date = currentdate -%}
-        {%- endif -%}
-        {%- assign _tags = '' -%}
-        {%- for tag in post.tags -%}
-          {%- assign _tag = tag | strip | url_encode -%}
-          {%- assign _tags = _tags | append: ',' | append: _tag -%}
-        {%- endfor -%}
-        {%- assign last = _tags | size | minus: 1 -%}
-        {%- assign _tags = _tags | slice: 1, last -%}
-        {%- assign __path = post.url -%}
-        {%- include snippets/prepend-baseurl.html -%}
-        {%- assign href = __return -%}
-        {%- assign __locale = site.data.locale.ARTICLE_LIST_DATE_FORMAT -%}
-        {%- include snippets/locale-to-string.html -%}
-        <li class="js-post-block" data-tag="{{ _tags }}">
-          <span class="post-date">{{ post.date | date: __return }}</span>
-          <a class="post-link" href="{{ href }}">{{ post.title }}</a>
-        </li>
-        {%- if forloop.last -%}</ul></section>{%- endif -%}
-      {%- endfor -%}
-    </section>
+    <div class="js-result m-result"></div>
   </div>
-</div>
-{%- include snippets/page-title.html -%}
-<script type="text/javascript">
-  // function queryString is copied from
-  // http://stackoverflow.com/questions/979975/how-to-get-the-value-from-url-parameter#answer-979995
-  function queryString() {
-    // This function is anonymous, is executed immediately and
-    // the return value is assigned to QueryString!
-    var i = 0,
-      queryObj = {},
-      pair;
-    var queryStr = window.location.search.substring(1);
-    var queryArr = queryStr.split('&');
-    for (i = 0; i < queryArr.length; i++) {
-      pair = queryArr[i].split('=');
-      // If first entry with this name
-      if (typeof queryObj[pair[0]] === 'undefined') {
-        queryObj[pair[0]] = pair[1];
-        // If second entry with this name
-      } else if (typeof queryObj[pair[0]] === 'string') {
-        queryObj[pair[0]] = [queryObj[pair[0]], pair[1]];
-        // If third or later entry with this name
-      } else {
-        queryObj[pair[0]].push(pair[1]);
-      }
-    }
-    return queryObj;
-  }
-
-  $(function() {
-    var $pageHeading = $('.js-page-heading');
-    var $articleTag = $('.js-article-tag');
-    var $tagShowAll = $('.js-tag-show-all');
-    var $postBlock = $('.js-post-block');
-    var $yearSection = $('.js-year-wrapper section');
-
-    window.tagSelect = function(tag) {
-      var i = 0,
-        flag = false,
-        cur, tagStr = '',
-        tags = [],
-        _tag = '',
-        lis = [];
-      if (tag === undefined || tag === '') {
-        $pageHeading.text('{{ __return }}');
-        $tagShowAll.focus();
-        $postBlock.show();
-      } else {
-        tag = tag.trim();
-        // $articleTag.filter('.tag-' + tag).focus();
-        for (i = 0; i < $articleTag.length; i++) {
-          cur = $articleTag.eq(i);
-          _tag = cur.data('tag');
-          if (typeof _tag === 'string' && _tag.trim() === tag) {
-            cur.focus();
-            tagStr = cur.children('span').text();
-            (typeof tagStr === 'string') && (tagStr = tagStr.trim());
-            $pageHeading.text('Tag: ' + tagStr);
-            break;
-          }
-        }
-        $postBlock.each(function() {
-          flag = false;
-          cur = $(this);
-          tags = cur.data('tag').split(',');
-          for (i = 0; i < tags.length; i++) {
-            _tag = tags[i].trim();
-            if (_tag === tag) {
-              flag = true;
-              cur.show();
-              break;
-            }
-          }
-          flag || (cur.hide());
-        });
-      }
-      $yearSection.each(function() {
-        flag = false;
-        cur = $(this);
-        lis = cur.find('li');
-        for (i = 0; i < lis.length; i++) {
-          if (lis.eq(i).css('display') !== 'none') {
-            flag = true;
-            break;
-          }
-        }
-        flag ? cur.show() : cur.hide();
-      });
-      tag === undefined || window.history.replaceState(null, '', window.location.href.split('?')[0] + '?tag=' + tag);
-    }
-
-    var query = queryString(),
-      tag = undefined;
-    query.tag === undefined || (tag = query.tag);
-    tagSelect(tag);
-  });
-</script>
+</div>

data/_layouts/base.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+{%- include snippets/get-lang.html -%}
+<html lang="{{ __return }}">
+  <head>
+    {%- include common-head.html -%}
+    {%- include head-icons-rel.html -%}
+    {%- assign __path = '/assets/css/blog.css' -%}
+    {%- include snippets/prepend-baseurl.html -%}
+    <link rel="stylesheet" href="{{ __return }}">
+    {%- include scripts/utils.html -%}
+  </head>
+  <body>
+    <div class="m-page-stage js-page-stage">
+      <div class="m-page-content">
+        {%- include components/header.html -%}
+        <div class="m-page-main">{{ content }}</div>
+      </div>
+    </div>
+    {%- include components/footer.html -%}
+    {%- include scripts/common.html -%}
+    {%- if page.layout == "home" -%}
+      {%- include scripts/home.html -%}
+    {%- elsif page.layout == "page" -%}
+      {%- include scripts/page-post.html -%}
+    {%- elsif page.layout == "post" -%}
+      {%- include scripts/page-post.html -%}
+      {%- include scripts/post.html -%}
+    {%- elsif page.layout == "all" -%}
+      {%- include scripts/all.html -%}
+    {%- endif -%}
+    {%- include utils/mathjax.html -%}
+    {%- include utils/mermaid.html -%}
+    {%- include utils/chart.html -%}
+    {%- if jekyll.environment != "development" -%}
+      {%- include utils/google-analytics.html -%}
+    {%- endif -%}
+  </body>
+</html>

data/_layouts/error-404.html

@@ -1,5 +1,5 @@
 ---
-layout: blog-default
+layout: base
 title: 404
 ---
 <div class="m-error-404">

data/_layouts/home.html

@@ -1,5 +1,5 @@
 ---
-layout: blog-default
+layout: base
 titles:
   en: Blog
   zh: 博客
@@ -27,7 +27,7 @@ titles:
           {%- assign __locale = site.data.locale.READMORE -%}
           {%- include snippets/locale-to-string.html -%}
           <a href="{{ href }}">{{ __return }}</a>
-          {%- include blog/article-data.html -%}
+          {%- include components/article-data.html -%}
         </article>
       {%- endfor -%}
     </div>
@@ -38,85 +38,98 @@ titles:
           {%- assign post_count = site.posts | size -%}
           {%- assign page_count = paginator.total_pages -%}
           <p>{{ __return | replace: '[POST_COUNT]', post_count | replace: '[PAGE_COUNT]', page_count }}</p>
-          <ul class="inline-list">
-          {%- if paginator.previous_page -%}
-            {%- assign __path = paginator.previous_page_path -%}
-            {%- include snippets/prepend-baseurl.html -%}
-            {%- assign href = __return -%}
-            <li><a class="round-button" href="{{ href }}">
-              <div class="icon icon--previous">{%- include icon/previous.svg -%}</div></a>
-            </li>
-          {%- else -%}
-            <li><div class="round-button inactive">
-              <div class="icon icon--prrevious">{%- include icon/previous.svg -%}</div></div>
-            </li>
-          {%- endif -%}
-          {%- for page in (1..paginator.total_pages) -%}
-            {%- if page == paginator.page -%}
-              <li>
-                <div class="round-button cur"><span>{{ page }}</span></div>
-              </li>
-            {%- elsif page == 1 -%}
-              {%- if site.paths.base -%}
-                {%- assign __path = site.paths.base -%}
+          <ul>
+            {%- assign _max_show = 5 -%}
+            {%- assign _max_show_modulo_two = _max_show | modulo: 2 -%}
+            {%- assign _length = paginator.total_pages -%}
+            {%- assign _length_mimus_one = _length | minus: 1 -%}
+            {%- assign _cur = paginator.page -%}
+            {%- assign _extra = _max_show | minus: 3 -%}
+            {%- assign _extra_half = _extra | divided_by: 2 -%}
+            {%- if  _max_show > 4 and _max_show_modulo_two == 1 and paginator.total_pages > _max_show -%}
+              {%- assign _condition0 = _extra | divided_by: 2 | plus: 1 -%}
+              {%- assign _condition1 = _length | minus: _extra_half  -%}
+              {%- if _cur <= _condition0 -%}
+                {%- assign _n0 = 2 -%}
+                {%- assign _n1 = _extra | plus: 2 -%}
+              {%- elsif _cur >= _condition1 -%}
+                {%- assign _n0 = _length | minus: _extra | minus: 1 -%}
+                {%- assign _n1 = _length | minus: 1 -%}
               {%- else -%}
-                {%- assign __path = '/' -%}
+                {%- assign _n0 = _cur | minus: _extra_half -%}
+                {%- assign _n1 = _cur | plus: _extra_half -%}
               {%- endif -%}
+            {%- endif -%}
+            {%- if paginator.previous_page -%}
+              {%- assign __path = paginator.previous_page_path -%}
               {%- include snippets/prepend-baseurl.html -%}
               {%- assign href = __return -%}
-              <li>
-                <a class="round-button" href="{{ href }}"><span>{{ page }}</span></a>
+              <li><a class="round-button" href="{{ href }}">
+                <div class="icon icon--previous">{%- include icon/previous.svg -%}</div></a>
               </li>
             {%- else -%}
-              {%- assign __path = site.paginate_path -%}
+              <li><div class="round-button inactive">
+                <div class="icon icon--prrevious">{%- include icon/previous.svg -%}</div></div>
+              </li>
+            {%- endif -%}
+
+            {%- for page in (1.._length) -%}
+              {%- if page == _cur -%}
+                <li>
+                  <div class="round-button cur"><span>{{ page }}</span></div>
+                </li>
+              {%- elsif page == 1 -%}
+                {%- if site.paths.base -%}
+                  {%- assign __path = site.paths.base -%}
+                {%- else -%}
+                  {%- assign __path = '/' -%}
+                {%- endif -%}
+                {%- include snippets/prepend-baseurl.html -%}
+                {%- assign href = __return -%}
+                <li>
+                  <a class="round-button" href="{{ href }}"><span>{{ page }}</span></a>
+                </li>
+              {%- else -%}
+                {%- if _n0 and _n1 -%}
+                  {%- if page > 1 and page < _n0 -%}
+                    {%- if page == 2 -%}<li><span class="omit">{%- include icon/omit.svg -%}</span></li>{%- endif -%}
+                  {%- elsif page > _n1 and page < _length -%}
+                    {%- if page == _length_mimus_one -%}<li><span class="omit">{%- include icon/omit.svg -%}</span></li>{%- endif -%}
+                  {%- else -%}
+                    {%- assign __path = site.paginate_path -%}
+                    {%- include snippets/prepend-baseurl.html -%}
+                    {%- assign href = __return -%}
+                    <li>
+                      <a class="round-button" href="{{ href | replace: ':num', page }}"><span>{{ page }}</span></a>
+                    </li>
+                  {%- endif -%}
+                {%- else -%}
+                  {%- assign __path = site.paginate_path -%}
+                  {%- include snippets/prepend-baseurl.html -%}
+                  {%- assign href = __return -%}
+                  <li>
+                    <a class="round-button" href="{{ href | replace: ':num', page }}"><span>{{ page }}</span></a>
+                  </li>
+                {%- endif -%}
+              {%- endif -%}
+            {%- endfor -%}
+            {%- if paginator.next_page -%}
+              {%- assign __path = paginator.next_page_path -%}
               {%- include snippets/prepend-baseurl.html -%}
               {%- assign href = __return -%}
               <li>
-                <a class="round-button" href="{{ href | replace: ':num', page }}"><span>{{ page }}</span></a>
+                <a class="round-button" href="{{ href }}">
+                  <div class="icon icon--next">{%- include icon/next.svg -%}</div>
+                </a>
               </li>
+            {%- else -%}
+                <li><div class="round-button inactive">
+                  <div class="icon icon--next">{%- include icon/next.svg -%}</div>
+                  </div>
+                </li>
             {%- endif -%}
-          {%- endfor -%}
-          {%- if paginator.next_page -%}
-            {%- assign __path = paginator.next_page_path -%}
-            {%- include snippets/prepend-baseurl.html -%}
-            {%- assign href = __return -%}
-            <li>
-              <a class="round-button" href="{{ href }}">
-                <div class="icon icon--next">{%- include icon/next.svg -%}</div>
-              </a>
-            </li>
-          {%- else -%}
-              <li><div class="round-button inactive">
-                <div class="icon icon--next">{%- include icon/next.svg -%}</div>
-                </div></li>
-          {%- endif -%}
           </ul>
         </nav>
     {%- endif -%}
   </div>
 </div>
-{%- if site.leancloud.app_id and site.leancloud.app_key and site.leancloud.app_class and site.isdebug == false -%}
-  <script src="//cdn1.lncld.net/static/js/3.4.1/av-min.js"></script>
-  <script>
-    $(function() {
-      AV.init({
-        appId: '{{ site.leancloud.app_id }}',
-        appKey: '{{ site.leancloud.app_key }}'
-      });
-      $(".article-view").each(function() {
-        var curId = this.id;
-        var query = new AV.Query('{{ site.leancloud.app_class }}');
-        query.equalTo('key', curId.substr(9));
-        query.first().then(function(result) {
-          if (result) {
-            $('#' + curId).text(result.attributes.views);
-          }
-        }, function(error) {
-          if (error) {
-            throw error;
-          }
-        });
-      });
-    });
-  </script>
-{%- endif -%}