From 231964080b26b3b3cab91b2c6144a784d3bef99d Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 00:06:35 +0800
Subject: In-post APlayer now support multiple files

---
 layouts/_default/single.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index db5e2f5..413cacc 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,7 +7,7 @@
     <div class="post-item post-meta">
         {{ partial "post-meta.html" . }}
     </div>
-    {{ with .Params.playerURL }}
+    {{ with .Params.player }}
     <div id="post-aplayer"></div>
     {{ end }}
     <!-- post main content -->
-- 
cgit v1.2.3


From 89fc2917985d3da944af8116e101748267d66104 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 23:17:37 +0800
Subject: Remove medium-zoom

---
 layouts/_default/_markup/render-image.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index b9020c7..1b20943 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1 +1,3 @@
-<img class="img-zoomable" src="{{ .Destination | safeURL }}" alt="{{ .Text }}" />
\ No newline at end of file
+<a href="{{ .Destination | safeURL }}" target="_blank">
+    <img src="{{ .Destination | safeURL }}" alt="{{ .Text }}" />
+</a>
\ No newline at end of file
-- 
cgit v1.2.3


From 72ccecdc5b8bd5fef140c706902eb2139068d748 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Sun, 14 Jun 2020 23:30:00 +0800
Subject: Generate json for searching

---
 layouts/_default/index.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 layouts/_default/index.json

(limited to 'layouts/_default')

diff --git a/layouts/_default/index.json b/layouts/_default/index.json
new file mode 100644
index 0000000..a823e62
--- /dev/null
+++ b/layouts/_default/index.json
@@ -0,0 +1,5 @@
+{{- $.Scratch.Add "search" slice -}}
+{{- range (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) -}}
+    {{- $.Scratch.Add "search" (dict "title" .Title "tags" .Params.tags "contents" .Plain "permalink" .Permalink) -}}
+{{- end -}}
+{{- $.Scratch.Get "search" | jsonify -}}
\ No newline at end of file
-- 
cgit v1.2.3


From d0569100c68fc2dd9c7fae4d91915fd49da8d71f Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 15 Jun 2020 14:13:02 +0800
Subject: Search page template

---
 layouts/_default/search.html | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 layouts/_default/search.html

(limited to 'layouts/_default')

diff --git a/layouts/_default/search.html b/layouts/_default/search.html
new file mode 100644
index 0000000..b92861a
--- /dev/null
+++ b/layouts/_default/search.html
@@ -0,0 +1,20 @@
+{{ define "main" }}
+<!-- page info section e.g. current tag & total archive pages -->
+<div class="page-info">
+    <form class="search-form" autocomplete="off">
+        <div class="search-input">
+            <input type="text" name="search-input" maxlength="40" required />
+        </div>
+        <div class="search-submit">
+            <button>搜索</button>
+        </div>
+    </form>
+</div>
+<!-- archives range in all posts -->
+<div class="post">
+    <h3 class="post-item post-title-archive">
+        Not Finished Yet
+    </h3>
+</div>
+
+{{ end }}
\ No newline at end of file
-- 
cgit v1.2.3


From a3376d1ad133455b73ca893e222c1aec89ae6d44 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 15 Jun 2020 23:50:54 +0800
Subject: Update searching based on Fuse.js

---
 layouts/_default/index.json  |  2 +-
 layouts/_default/search.html | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/index.json b/layouts/_default/index.json
index a823e62..bf08b0f 100644
--- a/layouts/_default/index.json
+++ b/layouts/_default/index.json
@@ -1,5 +1,5 @@
 {{- $.Scratch.Add "search" slice -}}
 {{- range (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) -}}
-    {{- $.Scratch.Add "search" (dict "title" .Title "tags" .Params.tags "contents" .Plain "permalink" .Permalink) -}}
+    {{- $.Scratch.Add "search" (dict "title" .Title "tags" .Params.tags "permalink" .Permalink) -}}
 {{- end -}}
 {{- $.Scratch.Get "search" | jsonify -}}
\ No newline at end of file
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index b92861a..f9c808c 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -1,20 +1,16 @@
 {{ define "main" }}
-<!-- page info section e.g. current tag & total archive pages -->
+<!-- search form -->
 <div class="page-info">
-    <form class="search-form" autocomplete="off">
+    <form class="search-form" method="GET">
         <div class="search-input">
-            <input type="text" name="search-input" maxlength="40" required />
+            <input name="search" type="text" autocapitalize="off" autocomplete="off" autocorrect="off"
+                   spellcheck="false" />
         </div>
         <div class="search-submit">
-            <button>搜索</button>
+            <button type="submit">SEARCH</button>
         </div>
     </form>
 </div>
-<!-- archives range in all posts -->
-<div class="post">
-    <h3 class="post-item post-title-archive">
-        Not Finished Yet
-    </h3>
-</div>
-
+<!-- search result and template -->
+<div id="search-result"></div>
 {{ end }}
\ No newline at end of file
-- 
cgit v1.2.3


From e7587236dbe98775315619d4f3b8d3f335001583 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 00:47:55 +0800
Subject: Update tags in search template

---
 layouts/_default/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index f9c808c..0911f06 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -3,7 +3,7 @@
 <div class="page-info">
     <form class="search-form" method="GET">
         <div class="search-input">
-            <input name="search" type="text" autocapitalize="off" autocomplete="off" autocorrect="off"
+            <input name="s" type="text" autocapitalize="off" autocomplete="off" autocorrect="off"
                    spellcheck="false" />
         </div>
         <div class="search-submit">
-- 
cgit v1.2.3


From c42924047c6f654c4723746790e041f8907ed378 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 14:00:53 +0800
Subject: Searching now works

---
 layouts/_default/index.json  |  2 +-
 layouts/_default/search.html | 29 ++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/index.json b/layouts/_default/index.json
index bf08b0f..e582dda 100644
--- a/layouts/_default/index.json
+++ b/layouts/_default/index.json
@@ -1,5 +1,5 @@
 {{- $.Scratch.Add "search" slice -}}
 {{- range (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) -}}
-    {{- $.Scratch.Add "search" (dict "title" .Title "tags" .Params.tags "permalink" .Permalink) -}}
+    {{- $.Scratch.Add "search" (dict "title" .Title "tags" .Params.tags "content" .Plain "permalink" .Permalink "date" (.Date.Format "2006-01-02")) -}}
 {{- end -}}
 {{- $.Scratch.Get "search" | jsonify -}}
\ No newline at end of file
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index 0911f06..c37d6b9 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -3,14 +3,37 @@
 <div class="page-info">
     <form class="search-form" method="GET">
         <div class="search-input">
-            <input name="s" type="text" autocapitalize="off" autocomplete="off" autocorrect="off"
+            <input name="s" type="search" autocapitalize="off" autocomplete="off" autocorrect="off"
                    spellcheck="false" />
-        </div>
-        <div class="search-submit">
             <button type="submit">SEARCH</button>
         </div>
     </form>
 </div>
 <!-- search result and template -->
+<div class="search-result-info" style="display: none;"><span>搜索用时：[TIME] ms，找到 [NUM] 个结果</span></div>
+<div class="search-result-info" style="display: none;"><span>搜索未找到结果</span></div>
+<div class="search-result-info" style="display: none;"><span>无法获取索引</span></div>
 <div id="search-result"></div>
+<script id="search-result-template" type="text/fuse-template">
+    {{ "<% for(var i = 0; i < $data.length; i++){ %>" | safeHTML }}
+    <div class="post">
+        <h3 class="post-item post-title-archive">
+            <a href="<%= $data[i].item.permalink %>">{{ "<%= $data[i].item.title %>" | safeHTML }}</a>
+        </h3>
+        <div class="post-item post-meta-archive">
+            <span><ion-icon name="today"></ion-icon>&nbsp;{{- "<%= $data[i].item.date %>" | safeHTML -}}</span>
+            <span>
+                <ion-icon name="pricetags"></ion-icon>&nbsp;
+                {{- "<% if ($data[i].item.tags && $data[i].item.tags.length > 0) { %>" | safeHTML -}}
+                    {{- "<% for(var j = 0; j < $data[i].item.tags.length; j++){ %>" | safeHTML -}}
+                        {{- "<%= $data[i].item.tags[j] %>&nbsp;" | safeHTML -}}
+                    {{- "<% } %>" | safeHTML -}}
+                {{- "<% } else { %>" | safeHTML -}}
+                    {{- i18n "postMetaNoTag" -}}
+                {{- "<% } %>" | safeHTML }}
+            </span>
+        </div>
+    </div>
+    {{ "<% } %>" | safeHTML }}
+</script>
 {{ end }}
\ No newline at end of file
-- 
cgit v1.2.3


From f88c7b78f224bf746b831001ec8cef01693a4b3c Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 16 Jun 2020 16:09:04 +0800
Subject: Search page i18n

---
 layouts/_default/search.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index c37d6b9..8948e45 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -5,14 +5,14 @@
         <div class="search-input">
             <input name="s" type="search" autocapitalize="off" autocomplete="off" autocorrect="off"
                    spellcheck="false" />
-            <button type="submit">SEARCH</button>
+            <button type="submit"><ion-icon name="search-circle-outline"></ion-icon></button>
         </div>
     </form>
 </div>
 <!-- search result and template -->
-<div class="search-result-info" style="display: none;"><span>搜索用时：[TIME] ms，找到 [NUM] 个结果</span></div>
-<div class="search-result-info" style="display: none;"><span>搜索未找到结果</span></div>
-<div class="search-result-info" style="display: none;"><span>无法获取索引</span></div>
+<div class="search-result-info" style="display: none;"><span>{{ i18n "searchSuccess" }}</span></div>
+<div class="search-result-info" style="display: none;"><span>{{ i18n "searchNotFound" }}</span></div>
+<div class="search-result-info" style="display: none;"><span>{{ i18n "searchFailed" }}</span></div>
 <div id="search-result"></div>
 <script id="search-result-template" type="text/fuse-template">
     {{ "<% for(var i = 0; i < $data.length; i++){ %>" | safeHTML }}
-- 
cgit v1.2.3


From 5c68750e0cd265464aa55b1f1d89e54f7e71ccc0 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 18 Jun 2020 14:17:51 +0800
Subject: Optimize toc & license settings logic

---
 layouts/_default/single.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 413cacc..26a8213 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -16,7 +16,7 @@
     </div>
 </article>
 <!-- post license -->
-{{ if and (.Site.Params.showLicense) (ne .Params.noLicense true) }}
+{{ if and (or .Site.Params.showLicense .Params.showLicense) (ne .Params.showLicense false) }}
 <div class="license markdown-body">
     <blockquote>
         <p>{{ i18n "postCopyrightFront" }}<a rel="license" href="{{ .Site.Params.licenseLink }}"
-- 
cgit v1.2.3


From f11691355ae9bd4dddf1f0ee3621d9064aaace6e Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 18 Jun 2020 14:29:11 +0800
Subject: Optimize comment area setting logic

---
 layouts/_default/single.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'layouts/_default')

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 26a8213..8f7eb35 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -24,11 +24,11 @@
     </blockquote>
 </div>
 {{ end }}
-{{ if .Site.Params.disqusJSApi }}
+{{ if and (.Site.Params.disqusJSApi) (ne .Params.showComments false) }}
 {{ partial "comment-disqusjs.html" . }}
-{{ else if .Site.Params.disqusShortname }}
+{{ else if and (.Site.Params.disqusShortname) (ne .Params.showComments false) }}
 {{ partial "comment-disqus.html" . }}
-{{ else if .Site.Params.utterancesRepo }}
+{{ else if and (.Site.Params.utterancesRepo) (ne .Params.showComments false) }}
 {{ partial "comment-utterances.html" . }}
 {{ else }}{{ end }}
 {{ end }}
\ No newline at end of file
-- 
cgit v1.2.3