diff --git a/hugo.toml b/hugo.toml
index a24d77b..bfc0213 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -14,19 +14,19 @@ theme = 'farallon'
[[languages.zh-cn.menu.main]]
name="影音"
url="/movies/"
- weight="5"
+ weight="3"
[[languages.zh-cn.menu.main]]
- name="分类"
- url="/categories/"
- weight="4"
+ name="说说"
+ url="/memos/"
+ weight="2"
[[languages.zh-cn.menu.main]]
name="标签"
url="/tags/"
- weight="3"
+ weight="4"
[[languages.zh-cn.menu.main]]
- name="文章"
+ name="归档"
url="/archives/"
- weight="2"
+ weight="5"
[[languages.zh-cn.menu.main]]
name="首页"
url="/"
diff --git a/layouts/section/memos.html b/layouts/section/memos.html
index 1cd2e9e..6f4adde 100644
--- a/layouts/section/memos.html
+++ b/layouts/section/memos.html
@@ -1,24 +1,20 @@
{{ define "main" }}
-
- {{- range (where (where .Site.Pages "Type" "in" "memo") "Kind" "page").GroupByDate "2006" }}
- {{ if (where .Pages "Section" "memo") }}
-
{{ .Key }}
- {{ range .Pages.ByPublishDate.Reverse.GroupByDate "January" }}
-
{{ .Key }}
-
- {{ range ((where .Pages "Section" "memo")) }}
- -
-
-
{{ .PublishDate.Format "Jan 02" }}
-
+
+ {{ if $.Site.Params.showprofile }}
+ {{ partial "profile.html" . }}
+ {{ end }}
+
+ {{ $pages := where .Site.RegularPages "Type" "in" "memo" }}
+ {{ $paginator := .Paginate ($pages) }}
+ {{ range $paginator.Pages }}
+ {{ if eq .Type "memo" }}
+ {{ partial "memo.html" . }}
+ {{ else }}
+ {{ partial "memo.html" . }}
{{ end }}
-
- {{ end }}
- {{ end }}
- {{ end }}
-
+ {{ end }}
+
+ {{ $paginator := .Paginate (where .Pages "Type" "posts") }}
+ {{partial "pagination.html" .}}
+
{{ end }}
\ No newline at end of file