update

jingfengshuo · Nov 4, 2018 · ce77f82 · ce77f82
1 parent 884c980
commit ce77f82
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 53 deletions.
diff --git a/R/fetch.R b/R/fetch.R
@@ -40,11 +40,16 @@ if(NROW(x)>0){
                 name = gsub("[^a-z0-9]+", "-", name)
                 name = gsub("--+", "-", name)
                 p = sprintf('content/post/%s.md', paste0(name))
+
                 sink(p)
                 cat('---\n')
-                cat(yaml::as.yaml(x[i,]))
+                cat(yaml::as.yaml(x[i,],))
+                cat('disable_comments: true\n')
                 cat('---\n')
                 cat(as.character(x[i,5]))
+                cat('<script>
+setTimeout(function() { window.location.href = {{ .LinkTitle }} }, 10000);
+</script>')
                 sink()
         }
 }

diff --git a/R/list.txt b/R/list.txt
@@ -11,7 +11,6 @@
 "lse.de/r-tistic/index.xml","2018-06-06"
 "d.rbind.io/index.xml","2018-06-06"
 "s.rbind.io/index.xml","2018-06-06"
-"www.liechi.org/index.xml","2018-06-06"
 "http://miller-crab-81816.netlify.com/index.xml","2018-06-06"
 "a.rbind.io/index.xml","2018-06-06"
 "michielvandijk.rbind.io/index.xml","2018-06-06"
@@ -53,6 +52,7 @@
 "maraaverick.rbind.io/index.xml","2018-10-30"
 "simplystatistics.org/index.xml","2018-11-01"
 "ropensci.org/blog/index.xml","2018-11-01"
+"www.liechi.org/index.xml","2018-11-04"
 "feeds.feedburner.com/ProfessorRobJHyndman","2018-11-04"
 "ewenme.rbind.io/index.xml","2018-11-04"
 "www.brodrigues.co/index.xml","2018-11-04"

diff --git a/content/about.md b/content/about.md
@@ -1,7 +1,6 @@
 ---
 title: Daily R
 author: Miao Yu
-type: about
 ---
 
 **Daily R** is a light news/blog aggregator website for R. 

diff --git a/content/archives.md b/content/archives.md
@@ -1,6 +1,5 @@
 ---
 title: Daily R Archives
-type: about
 ---
 
 {{< archives >}}
diff --git a/content/contributor.md b/content/contributor.md
@@ -1,5 +1,4 @@
 ---
 title: Daily R
 author: Miao Yu, Yihui Xie
-type: about
 ---
diff --git a/content/post/-cn-2018-11-evo-3.md b/content/post/-cn-2018-11-evo-3.md
@@ -0,0 +1,12 @@
+---
+title: 进化之一点点-3
+date: '2018-11-03'
+linkTitle: /cn/2018/11/evo-3/
+source: Homepage on Liechi | 張列弛
+description: 早期的进化思想 生活在公元前六世纪的阿拉克西曼德觉得,人在远古时代应该不是现在这个样子，因为和别的动物刚出生就能又跑又跳的幼崽相比，在野外人没
+  ...
+disable_comments: true
+---
+早期的进化思想 生活在公元前六世纪的阿拉克西曼德觉得,人在远古时代应该不是现在这个样子，因为和别的动物刚出生就能又跑又跳的幼崽相比，在野外人没 ...<script>
+setTimeout(function() { window.location.href = {{ .LinkTitle }} }, 10000);
+</script>
diff --git a/themes/hugo-xmag/layouts/_default/about.html b/themes/hugo-xmag/layouts/_default/about.html
diff --git a/themes/hugo-xmag/layouts/_default/single.html b/themes/hugo-xmag/layouts/_default/single.html
@@ -28,18 +28,12 @@ <h3 class="author">{{ partial "author_names.html" . }}</h3>
 {{ end }}
 
 <main>
-<p>Source: {{ .Params.source }}</p>
-<p>Link: <a href="{{ .LinkTitle  }}">{{ .Title }}</a></p>
 {{ .Content }}
-<!-- delay 10s to original posts -->
-<script>
-setTimeout(function() { window.location.href = {{ .LinkTitle }} }, 10000);
-</script>
 </main>
 {{ partial "author.html" . }}
 {{ partial "info.html" . }}
 {{ partial "prev_next.html" . }}
-<!-- {{ partial "comments.html" . }} -->
+{{ partial "comments.html" . }}
 </article>
 </div>
 

diff --git a/themes/hugo-xmag/layouts/partials/comments.html b/themes/hugo-xmag/layouts/partials/comments.html
@@ -1 +1,5 @@
-{{ template "_internal/disqus.html" . }}
+{{ if and .Site.DisqusShortname (not (or .Site.Params.disable_comments .Params.disable_comments)) }}
+<section class="comments">
+	{{ template "_internal/disqus.html" . }}
+</section>
+{{ end }}