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 +-
 layouts/partials/sidebar.html | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'layouts')

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 }}"
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index a730c0b..af737ce 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,11 +1,13 @@
 <aside class="col-12 col-md-3 float-left sidebar">
     <!-- in-post toc -->
-    {{ if and (in .Site.Params.mainSections .Type) (and (.Site.Params.showToc) (ne .Params.noToc true)) }}
+    {{ if in .Site.Params.mainSections .Type }}
+    {{ if and (or .Site.Params.showToc .Params.showToc) (ne .Params.showToc false) }}
     <div class="sidebar-item sidebar-toc">
         <h3>{{ i18n "sidebarToc" }}</h3>
         {{ .TableOfContents }}
     </div>
     {{ end }}
+    {{ end }}
     <!-- pages -->
     <div class="sidebar-item sidebar-pages">
         <h3>{{ i18n "sidebarPages" }}</h3>
@@ -43,8 +45,8 @@
     <!-- bgm.tv image chart -->
     <div class="sidebar-item sidebar-bgm">
         <h3>{{ i18n "sidebarBangumiChart" }}</h3>
-        <img class="lazyload" src="{{ $.Site.Params.lazyPlaceholder | relURL }}" data-src="https://bgm.tv/chart/img/{{ . }}"
-             alt="Bangumi 图像榜单" />
+        <img class="lazyload" src="{{ $.Site.Params.lazyPlaceholder | relURL }}"
+             data-src="https://bgm.tv/chart/img/{{ . }}" alt="Bangumi 图像榜单" />
     </div>
     {{ end }}
 </aside>
\ No newline at end of file
-- 
cgit v1.2.3