Merge pull request #34 from amzrk2/dev

Pre-release v2.1.0

4 files changed, 52 insertions, 6 deletions

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
diff --git a/layouts/_default/index.json b/layouts/_default/index.json
new file mode 100644
index 0000000..e582dda
--- /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 "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
new file mode 100644
index 0000000..8948e45
--- /dev/null
+++ b/layouts/_default/search.html
@@ -0,0 +1,39 @@
+{{ define "main" }}
+<!-- search form -->
+<div class="page-info">
+    <form class="search-form" method="GET">
+        <div class="search-input">
+            <input name="s" type="search" autocapitalize="off" autocomplete="off" autocorrect="off"
+                   spellcheck="false" />
+            <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>{{ 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 }}
+    <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
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index db5e2f5..8f7eb35 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 -->
@@ -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 }}"
@@ -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