Wide mode with sidebar for single pages

szpak · Mar 9, 2020 · b44e036 · b44e036
1 parent b5d130b
commit b44e036
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 4 deletions.
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,6 +1,11 @@
 {{ define "main" }}
 
-<main class="single__main {{ if or ($.Param "enableToc") ($.Param "toc") }}{{ if $.Param "hideToc" }}main{{ else if eq ($.Param "tocPosition") "outer" }}main{{ else }}main-main{{ end }}{{ else }}main{{ end }}">
+{{ if $.Param "enableSidebarSingle" }}
+<main class="main inner inner-for-embedding" data-sidebar-position="{{ $.Param "sidebarPosition" }}">
+<div class="list__main wrapper wrapper-embedded {{ if $.Param "enableSidebar" }}{{ if eq ($.Param "sidebarPosition") "left" }}mr{{ else }}lm{{ end }}{{ else }}lmr{{ end }}">
+{{ end }}
+
+<main class="single__main {{ if $.Param "enableSidebarSingle" }}main-embedded {{ end }}{{ if or ($.Param "enableToc") ($.Param "toc") }}{{ if $.Param "hideToc" }}main{{ else if eq ($.Param "tocPosition") "outer" }}main{{ else }}main-main{{ end }}{{ else }}main{{ end }}">
   {{ if $.Param "enableBreadcrumb" }}
     {{ partial "body/breadcrumb" . }}
   {{ end }}
@@ -39,11 +44,21 @@ <h2 class="single__title" data-ani="{{ $.Site.Params.enableUiAnimation | default
   </div>
 </main>
 
-{{ if and (or ($.Param "enableToc") ($.Param "toc")) (ne ($.Param "tocPosition") "outer") }}
+{{ if and (or ($.Param "enableToc") ($.Param "toc")) (ne ($.Param "tocPosition") "outer") (not ($.Param "enableSidebarSingle")) }}
 <aside class="single__side {{ if or ($.Param "enableToc") ($.Param "toc") }}main-side{{ end }}">
   {{ partial "sidebar/sidebar-single" . }}
 </aside>
 {{ end }}
+
+{{ if $.Param "enableSidebarSingle" }}
+</div>
+<aside class="list__sidebar {{ if eq ($.Param "sidebarPosition") "left" }}l{{ else }}r{{ end }}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
+    {{ partial "sidebar/sidebar-home" . }}
+</aside>
+</main>
+{{ partial "script/sidebar-script" . }}
+{{ end }}
+
 <script>
   {{ $enableToc:= $.Param "enableToc" }}
   {{ $toc:= $.Param "toc" }}

diff --git a/layouts/about/single.html b/layouts/about/single.html
@@ -1,4 +1,10 @@
 {{ define "main" }}
+
+{{ if $.Param "enableSidebarSingle" }}
+<main class="main inner" data-sidebar-position="{{ $.Param "sidebarPosition" }}">
+<div class="list__main list__main--about {{ if $.Param "enableSidebar" }}{{ if eq ($.Param "sidebarPosition") "left" }}mr{{ else }}lm{{ end }}{{ else }}lmr{{ end }}">
+{{ end }}
+
 <header class="header basicflex-column">
   <h3 class="h3 terms__title">
     {{ .Title }}
@@ -13,4 +19,14 @@ <h3 class="h3 terms__title">
   {{ partial "search/site-search" . }}
 </div>
 {{ partial "script/about-script" . }}
-{{ end }}
+
+{{ if $.Param "enableSidebarSingle" }}
+</div>
+<aside class="list__sidebar {{ if eq ($.Param "sidebarPosition") "left" }}l{{ else }}r{{ end }}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
+    {{ partial "sidebar/sidebar-home" . }}
+</aside>
+</main>
+{{ partial "script/sidebar-script" . }}
+{{ end }}
+
+{{ end }}
diff --git a/layouts/partials/sidebar/sidebar-home.html b/layouts/partials/sidebar/sidebar-home.html
@@ -1,6 +1,8 @@
 {{ if $.Param "enableSidebar" }}
 <div class="sidebar">
+    {{ if .IsHome }}
     {{ partial "search/site-search" . }}
+    {{ end }}
     {{ partial "sidebar/site-bio" . }}
     {{ partial "sidebar/custom-home" . }}
     {{ partial "sidebar/list/posts-by-order" . }}

diff --git a/layouts/partials/sidebar/site-bio.html b/layouts/partials/sidebar/site-bio.html
@@ -21,8 +21,8 @@
       {{ end }}     
     {{ end }}
   </div>
-  {{ end }}
   <hr class="hr-slash bio-hr"/>
+  {{ end }}
   <div class="bio__name">
     {{ $.Param "myname" }}
   </div>

diff --git a/layouts/showcase/list.html b/layouts/showcase/list.html
@@ -1,4 +1,10 @@
 {{ define "main" }}
+
+{{ if $.Param "enableSidebarSingle" }}
+<main class="main inner" data-sidebar-position="{{ $.Param "sidebarPosition" }}">
+<div class="list__main {{ if $.Param "enableSidebar" }}{{ if eq ($.Param "sidebarPosition") "left" }}mr{{ else }}lm{{ end }}{{ else }}lmr{{ end }}">
+{{ end }}
+
 <main class="main showcase inner" data-sidebar-position="{{ $.Param "sidebarPosition" }}">
   {{ if .Params.enableBio }}
     <aside class="{{ if eq ($.Param "sidebarPosition") "left" }}l{{ else }}r{{ end }}">
@@ -29,4 +35,14 @@
     </div>
   {{ end }}
 </main>
+
+{{ if $.Param "enableSidebarSingle" }}
+</div>
+<aside class="list__sidebar {{ if eq ($.Param "sidebarPosition") "left" }}l{{ else }}r{{ end }}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
+    {{ partial "sidebar/sidebar-home" . }}
+</aside>
+</main>
+{{ partial "script/sidebar-script" . }}
+{{ end }}
+
 {{ end }}
diff --git a/layouts/talks/list.html b/layouts/talks/list.html
@@ -1,6 +1,11 @@
 {{ define "main" }}
 {{ $titleWrap := .Params.titleWrap }}
 
+{{ if $.Param "enableSidebarSingle" }}
+<main class="main inner" data-sidebar-position="{{ $.Param "sidebarPosition" }}">
+<div class="list__main {{ if $.Param "enableSidebar" }}{{ if eq ($.Param "sidebarPosition") "left" }}mr{{ else }}lm{{ end }}{{ else }}lmr{{ end }}">
+{{ end }}
+
 <header class="header basicflex-column">
   <h3 class="h3 terms__title">
     {{ .Title }}
@@ -53,4 +58,14 @@ <h6 class="archive__subtitle h6">
   </div>
   {{ partial "script/archive-script" . }}
 </main>
+
+{{ if $.Param "enableSidebarSingle" }}
+</div>
+<aside class="list__sidebar {{ if eq ($.Param "sidebarPosition") "left" }}l{{ else }}r{{ end }}" data-dir="{{ $.Param "languagedir" | default "ltr" }}">
+    {{ partial "sidebar/sidebar-home" . }}
+</aside>
+</main>
+{{ partial "script/sidebar-script" . }}
+{{ end }}
+
 {{ end }}