replace .URL to .Permalink && add prevnext.html

7 files changed, 45 insertions, 19 deletions

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 6f4893b..0e691ec 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -1,13 +1,14 @@
-baseURL = "http://baidu.com/"
-languageCode = "en-us"
-title = "Y4er - 信安爱好者"
+baseURL = "https://y4er.com/"
+languageCode = "zh-cn"
+title = "Y4er的博客 | 伪程序员,信安爱好者,专注于网络攻防和信息安全"
 theme = "easybook"
 
-# Syntax highlighting by Chroma. NOTE: Don't enable `highlightInClient` and `chroma` at the same time!
 pygmentsCodefences = true
 pygmentsUseClasses = true
-pygmentsCodefencesGuessSyntax = true    # 没有语言标记的尝试高亮
+pygmentsCodefencesGuessSyntax = true
 
+paginate = 8                                              # 首页每页显示的文章数
+googleAnalytics = "UA-131218098-1"      # UA-XXXXXXXX-X
 # 右上角菜单
 [[menu.main]]
   name = "Home"
@@ -33,14 +34,14 @@ pygmentsCodefencesGuessSyntax = true    # 没有语言标记的尝试高亮
 # 站点信息
 [params]
   author = "Y4er"
-  whoami = "初遇"
-  avatar = "https://avatars1.githubusercontent.com/u/40487319?s=460&v=4"
-  keywords = ["关键字","keywords"]
-  description = "这里是描述"
+  whoami = "哀吾生之须臾,羡长江之无穷."
+  avatar = "https://y4er.com/img/uploads/20190430191344.png"
+  keywords = ["Y4er","信息安全","网络安全","红蓝攻防","渗透测试","bypass","waf","注入","黑客","chabug"]
+  description = "伪程序员,信安爱好者,专注于网络攻防和信息安全."
 
   [params.social]
     GitHub = "http://github.com/Y4er"
-    Email = "github.com/Y4er"
+    Email = "admin@chabug.org"
   [params.utterances]       # https://utteranc.es/
     owner = "Y4er"              # Your GitHub ID
     repo = "Y4er.com"               # The repo to store comments
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index bde4723..5370520 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -7,7 +7,7 @@
         <h2 class="category" id="{{ $key }}">{{ $key }}</h2>
         <ul>
             {{ range $value }}
-            <li><span>{{.Date.Format "Jan 2, 2006"}}</span> » <a href="{{ .URL }}">{{ title .Title}}</a></li>
+            <li><span>{{.Date.Format "Jan 2, 2006"}}</span> » <a href="{{ .Permalink }}">{{ title .Title}}</a></li>
             {{ end }}
         </ul>
         {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5fea957..9d28259 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,6 @@
 {{ define "content" -}}
 <div class="post">
+    <!-- post -->
     <header class="post-header">
         <h1 class="post-title">{{ title .Title}}</h1>
         <p class="post-meta">{{.Date.Format "Jan 2, 2006"}}</p>
@@ -14,8 +15,11 @@
         {{ $finalContent }}
     </article>
 
-    <!-- TODO 上一篇下一篇 -->
-
+    <!-- 上一篇下一篇 -->
+    <div class="prevnext">
+        {{ partial "prevnext" . }}
+    </div>
+    <!-- comments -->
     <div class="post-comments">
         {{ partial "comments" . }}
     </div>
diff --git a/layouts/index.html b/layouts/index.html
index 3fa35ef..7606dcd 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -8,7 +8,7 @@
         <!--读取分页内容-->
         {{ range $paginator.Pages }}
         <li>
-            <h2><a href="{{ .URL }}">{{ title .Title | safeHTML }}</a></h2>
+            <h2><a href="{{ .Permalink }}">{{ title .Title | safeHTML }}</a></h2>
             <div class="post-meta">{{ .Date.Format "Jan 2, 2006" }}</div>
             <div class="post-excerpt">
                 {{ .Summary | safeHTML }}
@@ -19,9 +19,9 @@
     <!-- pagination -->
     <div class="pagination">
         {{ with $paginator.Prev -}}
-        <a href="{{ .URL }}" class="next">PREV</a>
+        <a href="{{ .URL }}" class="previous">PREV</a>
         {{- end }}
-        <span class="page_number ">{{ $paginator }} of {{ $paginator.TotalPages }}</span>
+        <span class="page_number ">{{ $paginator.PageNumber }} of {{ $paginator.TotalPages }}</span>
         {{ with $paginator.Next -}}
         <a href="{{ .URL }}" class="next">NEXT</a>
         {{- end }}
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
index 0d3e8cf..82e0ae5 100644
--- a/layouts/partials/comments.html
+++ b/layouts/partials/comments.html
@@ -19,7 +19,7 @@
 
   <!-- changyan -->
   {{- if and .Site.Params.changyanAppid .Site.Params.changyanAppkey -}}
-    <div id="SOHUCS" sid="{{ .URL }}"></div>
+    <div id="SOHUCS" sid="{{ .Permalink }}"></div>
     <script type="text/javascript">
     (function(){
       if (window.location.hostname === 'localhost') return;
@@ -100,7 +100,7 @@
   {{- if .Site.Params.valine.enable -}}
   <!-- id 将作为查询条件 -->
     {{- if .Site.Params.valine.visitor -}}
-	  <span id="{{ .URL | relURL }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
+	  <span id="{{ .Permalink | relURL }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
 		<span class="post-meta-item-text">文章阅读量 </span>
 		<span class="leancloud-visitors-count">0</span>
 		<p></p>
diff --git a/layouts/partials/prevnext.html b/layouts/partials/prevnext.html
new file mode 100644
index 0000000..9a1faee
--- /dev/null
+++ b/layouts/partials/prevnext.html
@@ -0,0 +1,21 @@
+{{$prev := .PrevInSection}}
+{{$next := .NextInSection}}
+
+{{if or $prev $next}}
+<ul class="prevnext">
+    {{if $prev}}
+    <li>上一篇：
+        <a href="{{$prev.Permalink}}">
+            {{title $prev.Title}}
+        </a>
+    </li>
+    {{end}}
+    {{if $next}}
+    <li>下一篇：
+        <a href="{{$next.Permalink}}">
+            {{title $next.Title}}
+        </a>
+    </li>
+    {{end}}
+</ul>
+{{end}}
\ No newline at end of file
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 87b2af1..be8c298 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -16,7 +16,7 @@
     <ul class="post-list">
         {{ range first 15 .Site.RegularPages }}
         <li>
-            <a href="{{ .URL }}" class="post-link">{{ title .Title }}</a>
+            <a href="{{ .Permalink }}" class="post-link">{{ title .Title }}</a>
         </li>
         {{ end }}
     </ul>