refactor: post meta

7 files changed, 149 insertions, 110 deletions

diff --git a/assets/sass/_partial/_post/_header.scss b/assets/sass/_partial/_post/_header.scss
index 4415519..2d3ccf3 100644
--- a/assets/sass/_partial/_post/_header.scss
+++ b/assets/sass/_partial/_post/_header.scss
@@ -5,9 +5,9 @@
   border-bottom: 2px LightGrey solid;
 
   .post-title {
-    margin: 0;
-    font-size: $post-title-font-size;
-    font-weight: $post-title-font-weight;
+    margin: unset;
+    font-size: 2em;
+    font-weight: 700;
     font-family: $global-serif-font-family;
 
     .post-pinned svg {
@@ -22,20 +22,50 @@
     @include underline-from-center;
   }
 
+  .post-title-i18n {
+    a {
+      color: $theme-color;
+      @include underline-from-center;
+    }
+  }
+
   .post-meta {
-    font-size: 14px;
-    color: $post-meta-font-color;
+    margin-top: 1em;
+    display: flex;
+    align-items: center;
+
+    .post-meta-author {
+      a {
+        color: $theme-color;
+      }
+    }
 
-    .post-time {
-      font-size: 15px;
+    .post-meta-time {
+      margin-left: 1em;
     }
 
-    .post-category {
+    .post-meta-lastmod {
+      margin-left: 0.5em;
+      font-size: 0.8em;
+      font-style: italic;
+    }
+
+    .post-meta__right {
+      margin-left: auto;
+      display: flex;
+      font-size: 0.8em;
+      flex-direction: column;
+      line-height: 1.318;
+      text-align: right;
+      color: $dark-gray;
+    }
+
+    .post-meta-category {
       display: inline;
 
       a {
         &::before {
-          content: '·';
+          content: "·";
         }
       }
     }
@@ -47,12 +77,5 @@
         color: $theme-color;
       }
     }
-
-    .more-meta {
-      &::before {
-        content: '·';
-      }
-    }
-
   }
 }
diff --git a/dev-config.toml b/dev-config.toml
index fc582e5..612d881 100644
--- a/dev-config.toml
+++ b/dev-config.toml
@@ -94,8 +94,9 @@ defaultContentLanguage = "en"  # Default language to use (if you setup multiling
   url = "https://gohugo.io"
 
 
-[author]                  # essential                     # 必需
-  name = "xianmin"
+[author]
+  name = "Jane"      # essential                     # 必需
+  url = "/about"        # optional                      # 可选
 
 [sitemap]                 # essential                     # 必需
   changefreq = "weekly"
@@ -125,7 +126,7 @@ defaultContentLanguage = "en"  # Default language to use (if you setup multiling
   dateFormatToUse = "2006-01-02"
 
   # show word count and read time ?                       # 是否显示字数统计与阅读时间
-  moreMeta = true
+  moreMeta = false
 
   # show language chooser in menu
   showMenuLanguageChooser = true
diff --git a/exampleSite/content/post/how-to-contribute.md b/exampleSite/content/post/how-to-contribute.md
index b69a2d6..822c8b8 100644
--- a/exampleSite/content/post/how-to-contribute.md
+++ b/exampleSite/content/post/how-to-contribute.md
@@ -7,7 +7,7 @@ tags = [
     "hugo",
     "Contribute",
 ]
-date = "2021-10-15"
+date = "2022-10-15"
 categories = [
     "Development",
     "index",
diff --git a/layouts/partials/post/i18nlist.html b/layouts/partials/post/i18nlist.html
index bdca1d4..239993a 100644
--- a/layouts/partials/post/i18nlist.html
+++ b/layouts/partials/post/i18nlist.html
@@ -1,7 +1,9 @@
 {{ if .IsTranslated }}
-<div class="post-meta">
-  {{ range .Translations }}
-  <div><a href="{{ .Permalink }}">{{ i18n (printf "read_%s" .Lang) }}: {{ .Title }}</a></div>
-  {{ end }}
-</div>
-{{ end }}
\ No newline at end of file
+  <div class="post-title-i18n">
+    {{ range .Translations }}
+      <div>
+        {{ i18n (printf "read_%s" .Lang) }}: <a href="{{ .Permalink }}">{{ .Title }}</a>
+      </div>
+    {{ end }}
+  </div>
+{{ end }}
diff --git a/layouts/partials/post/meta.html b/layouts/partials/post/meta.html
new file mode 100644
index 0000000..6587cbc
--- /dev/null
+++ b/layouts/partials/post/meta.html
@@ -0,0 +1,74 @@
+<div class="post-meta">
+  <div class="post-meta-author">
+    by
+    {{- $author_id := .Params.author | default .Site.Author.name -}}
+    {{- $author := (index ($.Site.Data.authors | default dict) $author_id) -}}
+    {{- $author_lang := (index ($author | default dict) .Site.Language.Lang) -}}
+    {{- $author_name := $author_lang.name.display | default $author.name.display | default $author_id -}}
+    {{- $author_url := $author_lang.url | default $author.url | default .Site.Author.url -}}
+    {{ if $author_url }}
+      <a href="{{ $author_url | relLangURL | safeURL }}">
+        <span class="post-meta-author-name">
+          {{ $author_name | safeHTML }}
+        </span>
+      </a>
+    {{ else }}
+      {{ $author_name | safeHTML }}
+    {{ end }}
+  </div>
+
+  <div class="post-meta-time">
+    <time datetime="{{ .Date.Format "2006-01-02" }}">
+      {{ .Date.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }}
+    </time>
+  </div>
+
+  {{ if ne (.Lastmod.Format ("2006-01-02")) (.Date.Format ("2006-01-02")) }}
+    <div class="post-meta-lastmod">
+      ({{ i18n "lastMod" }}:
+      {{ .Lastmod.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }})
+    </div>
+  {{ end }}
+
+
+  <div class="post-meta__right">
+    {{ if .Site.Params.moreMeta -}}
+      <span class="post-meta-more">
+        {{ i18n "wordCount" .WordCount }} -
+        {{ i18n "readingTime" .ReadingTime }}
+      </span>
+    {{- end }}
+
+    {{ with .Params.categories -}}
+      <div class="post-meta-category">
+        {{ range . }}
+          {{- $name := . -}}
+          {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}}
+            <a href="{{ .Permalink }}"> {{ $name }} </a>
+          {{ end -}}
+        {{ end }}
+      </div>
+    {{- end }}
+
+
+    <!-- Counter busuanzi -->
+    {{ if .Site.Params.counter.busuanzi.enable }}
+      <span id="busuanzi_container_page_pv">
+        | 阅读 <span id="busuanzi_value_page_pv"></span>
+      </span>
+    {{ end }}
+
+
+    <!-- Counter leancloud -->
+    {{ if .Site.Params.counter.leancloud.enable }}
+      <span
+        id="{{ .RelPermalink }}"
+        class="leancloud_visitors"
+        data-flag-title="{{ .Title }}"
+      >
+        <span class="post-meta-item-text"> | 阅读 </span>
+        <span class="leancloud-visitors-count"></span>
+      </span>
+    {{ end }}
+  </div>
+</div>
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 903d60d..5622fb4 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,49 +1,16 @@
 {{ define "content" -}}
-
   <article class="post bg-white">
     <!-- post-header -->
     <header class="post-header">
       <h1 class="post-title">{{ .Title }}</h1>
       {{ partial "post/i18nlist.html" . }}
-      <div class="post-meta">
-        <time datetime="{{ .Date.Format "2006-01-02" }}" class="post-time">
-          {{ .Date.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }}
-        </time>
-        {{ with .Params.categories -}}
-          <div class="post-category">
-            {{ range . }}
-            {{- $name := . -}}
-            {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}}
-              <a href="{{ .Permalink }}"> {{ $name }} </a>
-            {{ end -}}
-            {{ end }}
-          </div>
-        {{- end }}
-        {{ if .Site.Params.moreMeta -}}
-          <span class="more-meta"> {{ i18n "wordCount" .WordCount }} </span>
-          <span class="more-meta"> {{ i18n "readingTime" .ReadingTime }} </span>
-        {{- end }}
-
-        <!-- Counter busuanzi -->
-        {{ if .Site.Params.counter.busuanzi.enable }}
-          <span id="busuanzi_container_page_pv">
-            | 阅读 <span id="busuanzi_value_page_pv"></span>
-          </span>
-        {{ end }}
-
-        <!-- Counter leancloud -->
-        {{ if .Site.Params.counter.leancloud.enable }}
-          <span id="{{ .RelPermalink }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
-            <span class="post-meta-item-text"> | 阅读 </span>
-            <span class="leancloud-visitors-count"></span>
-          </span>
-        {{ end }}
-      </div>
+      {{ partial "post/meta.html" . }}
     </header>
 
     <!-- TOC -->
     {{ partial "post/toc.html" . }}
 
+
     <!-- Content -->
     <div class="post-content">
       {{ .Content }}
@@ -52,21 +19,24 @@
     <!-- Copyright -->
     {{ partial "post/copyright.html" . }}
 
+
     <!-- Reward -->
     {{ partial "post/reward.html" . }}
 
+
     <footer class="post-footer">
       {{ with .Params.tags -}}
         <div class="post-tags">
           {{ range . }}
-          {{- $name := . -}}
-          {{- with $.Site.GetPage "taxonomy" (printf "tags/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "tags/%s" ($name | urlize))) -}}
-          <a href="{{ .Permalink }}">{{ $name }}</a>
-          {{ end -}}
+            {{- $name := . -}}
+            {{- with $.Site.GetPage "taxonomy" (printf "tags/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "tags/%s" ($name | urlize))) -}}
+              <a href="{{ .Permalink }}">{{ $name }}</a>
+            {{ end -}}
           {{ end }}
         </div>
       {{- end }}
 
+
       <!-- Post Pagination -->
       <nav class="post-nav">
         {{ with .NextInSection }}
@@ -95,9 +65,10 @@
 
   <!-- Author Info -->
   {{ if and (.Params.author | default .Site.Author.name) (.Params.showAuthorInfo | default .Site.Params.showAuthorInfo) }}
-  {{ partial "author_info.html" (dict "author" (.Params.author | default .Site.Author.name) "context" $) }}
+    {{ partial "author_info.html" (dict "author" (.Params.author | default .Site.Author.name) "context" $) }}
   {{ end }}
 
+
   <!-- Comments -->
   {{ partial "comments.html" . }}
 {{- end }}
diff --git a/layouts/post/summary.html b/layouts/post/summary.html
index ef1c1b5..fa93482 100644
--- a/layouts/post/summary.html
+++ b/layouts/post/summary.html
@@ -9,55 +9,23 @@
       <a class="post-link" href="{{ .RelPermalink }}">{{ .Title }}</a>
     </h1>
     {{ partial "post/i18nlist.html" . }}
-    <div class="post-meta">
-      <time datetime="{{ .Date.Format "2006-01-02" }}" class="post-time">
-        {{ .Date.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }}
-      </time>
-      {{ with .Params.categories -}}
-        <div class="post-category">
-          {{ range . }}
-          {{- $name := . -}}
-          {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}}
-            <a href="{{ .Permalink }}"> {{ $name }} </a>
-          {{ end -}}
-          {{ end }}
-        </div>
-      {{- end }}
-      {{ if .Site.Params.moreMeta -}}
-      <span class="more-meta"> {{ i18n "wordCount" .WordCount }} </span>
-      <span class="more-meta"> {{ i18n "readingTime" .ReadingTime }} </span>
-        {{ if .Site.Params.commentCount.disqus.enable }}
-        <span class="more-meta"> <a href="{{ .Permalink }}#disqus_thread">{{ i18n "comments" }}</a> </span>
-        {{ end }}
-        {{ if .Site.Params.commentCount.remark42.enable }}
-        <span class="more-meta"><span
-         class="remark42__counter"
-         data-url="{{ .Permalink }}"
-        ></span></span> {{ i18n "comments" }}
-        {{ end }}
-      {{- end }}
-      <!-- Counter leancloud -->
-      {{ if .Site.Params.counter.leancloud.enable }}
-        <span id="{{ .RelPermalink }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
-          <span class="post-meta-item-text"> | 阅读 </span>
-          <span class="leancloud-visitors-count"></span>
-        </span>
-      {{ end }}
-    </div>
+    {{ partial "post/meta.html" . }}
   </header>
   <!-- Content -->
   <div class="post-content">
     {{ if .Site.Params.homeFullContent }}
-    <div class="post-summary">
-      {{ .Content }}
-    </div>
+      <div class="post-summary">
+        {{ .Content }}
+      </div>
     {{ else }}
-    <div class="post-summary">
-      {{ .Summary }}
-    </div>
-    <div class="read-more">
-      <a href="{{ .RelPermalink }}" class="read-more-link">{{ i18n "readmore" }}</a>
-    </div>
+      <div class="post-summary">
+        {{ .Summary }}
+      </div>
+      <div class="read-more">
+        <a href="{{ .RelPermalink }}" class="read-more-link"
+          >{{ i18n "readmore" }}</a
+        >
+      </div>
     {{ end }}
   </div>
 </article>