better support blog, exampleSite update

8 files changed, 70 insertions, 30 deletions

diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 9732a96..e5f8f86 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -14,10 +14,10 @@
         {{ .Summary }}
       {{ end }}
     </div>
-    {{ if $params.featured_image }}
+    {{ if $params.image }}
     <div class="summary-card__image-wrapper">
       <a href="{{ .Permalink }}">
-        <img data-src="{{ (print "images/" $params.featured_image) | relURL }}" alt="{{ print $params.featured_image }}" src="data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath fill='none' d='M0 0h24v24H0V0z'/%3E%3Cpath fill='%23aaa' d='M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-1 16H6c-.55 0-1-.45-1-1V6c0-.55.45-1 1-1h12c.55 0 1 .45 1 1v12c0 .55-.45 1-1 1zm-4.44-6.19l-2.35 3.02-1.56-1.88c-.2-.25-.58-.24-.78.01l-1.74 2.23c-.26.33-.02.81.39.81h8.98c.41 0 .65-.47.4-.8l-2.55-3.39c-.19-.26-.59-.26-.79 0z'/%3E%3C/svg%3E" class="lazyload summary-card__image"/>
+        <img data-src="{{ $.Param "image" | relURL }}" alt="{{ $.Param "image" }}" src="data:image/svg+xml,%0A%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath fill='none' d='M0 0h24v24H0V0z'/%3E%3Cpath fill='%23aaa' d='M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-1 16H6c-.55 0-1-.45-1-1V6c0-.55.45-1 1-1h12c.55 0 1 .45 1 1v12c0 .55-.45 1-1 1zm-4.44-6.19l-2.35 3.02-1.56-1.88c-.2-.25-.58-.24-.78.01l-1.74 2.23c-.26.33-.02.81.39.81h8.98c.41 0 .65-.47.4-.8l-2.55-3.39c-.19-.26-.59-.26-.79 0z'/%3E%3C/svg%3E" class="lazyload summary-card__image"/>
       </a>
     </div>
     {{ else if $params.featured_video }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 66c49bb..efc66c2 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,28 +1,42 @@
 {{ define "main" }}
 <div class="top">
-  <header class="main">
-    <div class="sv" data-view="full">
-      {{ partial "header/taxo-header.html" . }}
+  <header class="header__wrapper bgcolor__header">
+    <div class="divider">
+      <div class="lmr">
+        {{ partial "header/taxo-header.html" . }}
+      </div>
     </div>
   </header>
-</div>
-<div class="mid">
-  <main class="main">
-    <div class="sv" data-view="full">
-      {{ $paginator := .Paginate (.Pages.GroupByDate (.Site.Params.taxoGroupByDate | default "2006")) .Site.Params.taxoPaginate }}
-      
-      {{ range ($paginator).PageGroups }}
-        <span class="taxo__key">{{ .Key }}</span>
-        <ul class="taxo__ul">
-          {{ range .Pages }}
-          <li class="taxo__li">
-            <a href="{{ .Permalink }}" class="taxo__title">{{ .Title }}</a>
-          </li>
+
+  <div class="header__wrapper bgcolor__breadcrumb">
+    <div class="divider">
+      <div class="lmr flexbox jc-center flex-wrap tag__wrapper">
+        {{ range $index, $element := .Site.Taxonomies.tags }}
+          {{ if $index }}
+            <a href="{{ $element.Page.RelPermalink }}" class="tag">
+              <span class="tag__text">
+                {{ $element.Page.Title }}
+              </span>
+              <span class="tag__num" dir="auto">
+                {{ printf "%#v" (len $element) }}
+              </span>
+            </a>
           {{ end }}
-        </ul>
-      {{ end }}
+        {{ end }}
+      </div>
+    </div>
+  </div>
+</div>
 
-      {{ partial "main/component/pagination.html" . }}
+<div class="mid blog__bg">
+  <main class="main blog__bg">
+    <div class="sv" data-view="full">
+      <div class="blog">
+        {{ range .RegularPages }}
+          {{ .Render "summary" }}
+        {{ end }}
+        {{ partial "main/component/pagination.html" . }}
+      </div>
     </div>
 
   </main>
diff --git a/layouts/blog/section.html b/layouts/blog/section.html
index 0d2b870..ac4f3cc 100644
--- a/layouts/blog/section.html
+++ b/layouts/blog/section.html
@@ -1,10 +1,31 @@
 {{ define "main" }}
 <div class="top">
-  <header class="main blog__bg">
-    <div class="sv" data-view="full">
-      {{ partial "header/blog-header.html" . }}
+  <header class="header__wrapper bgcolor__header">
+    <div class="divider">
+      <div class="lmr">
+        {{ partial "header/blog-header.html" . }}
+      </div>
     </div>
   </header>
+  
+  <div class="header__wrapper bgcolor__breadcrumb">
+    <div class="divider">
+      <div class="lmr flexbox jc-center flex-wrap tag__wrapper">
+        {{ range $index, $element := .Site.Taxonomies.tags }}
+          {{ if $index }}
+            <a href="{{ $element.Page.RelPermalink }}" class="tag">
+              <span class="tag__text">
+                {{ $element.Page.Title }}
+              </span>
+              <span class="tag__num" dir="auto">
+                {{ printf "%#v" (len $element) }}
+              </span>
+            </a>
+          {{ end }}
+        {{ end }}
+      </div>
+    </div>
+  </div>
 </div>
 <div class="mid blog__bg">
   <main class="main blog__bg">
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 98ac7ea..271a365 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -6,6 +6,9 @@
     </nav>
 
     <article id="list-main" class="m">
+      {{ if $.Param "enableBlogBreadcrumb" }}
+        {{ partial "main/component/breadcrumb.html" . }}
+      {{ end }}
       {{ partial "main/sections/list-main.html" . }}
       {{ partial "main/component/pagination-single.html" . }}
     </article>
diff --git a/layouts/partials/header/blog-header-text.html b/layouts/partials/header/blog-header-text.html
index f34fa2b..fe352e1 100644
--- a/layouts/partials/header/blog-header-text.html
+++ b/layouts/partials/header/blog-header-text.html
@@ -1,7 +1,7 @@
 {{ if .Params.header }}
   {{ range .Params.header }}
     {{ if eq .type "text" }}
-    <div class="blog-header blog-header__align-{{ .align }}" style="width: 100%; height: {{ .height }}px; padding: {{ .paddingY }}px {{ .paddingX }}px;">
+    <div class="blog-header blog-header__align-{{ .align }}" style="width: 100%; height: {{ $.Param "headerHeight" | default 112 }}px;">
       {{ $header := . }}
       {{ if .title }}
         {{ range .title }}
diff --git a/layouts/partials/header/taxo-header.html b/layouts/partials/header/taxo-header.html
index dbb5b7c..2d31e35 100644
--- a/layouts/partials/header/taxo-header.html
+++ b/layouts/partials/header/taxo-header.html
@@ -1,3 +1,5 @@
-<header class="taxo__header">
-  {{ .Title }}
-</header>
\ No newline at end of file
+<div class="blog-header blog-header__align-center" style="width: 100%; height: {{ $.Param "headerHeight" | default 112 }}px;">
+  <div class="blog-header__title">
+    {{ .Title }}
+  </div>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/main/component/breadcrumb.html b/layouts/partials/main/component/breadcrumb.html
index f00cec0..1f16ce1 100644
--- a/layouts/partials/main/component/breadcrumb.html
+++ b/layouts/partials/main/component/breadcrumb.html
@@ -1,4 +1,4 @@
-<nav class="breadcrumb" aria-label="breadcrumbs">
+<nav class="breadcrumb" aria-label="breadcrumbs" data-is-blog="{{ if eq .Type "blog" }}true{{ else }}false{{ end }}">
   <ol>
     {{ template "breadcrumbnav" (dict "p1" . "p2" .) }}
   </ol>
diff --git a/layouts/partials/main/header.html b/layouts/partials/main/header.html
index b1f9c68..dfc8595 100644
--- a/layouts/partials/main/header.html
+++ b/layouts/partials/main/header.html
@@ -2,7 +2,7 @@
   <div class="header__wrapper bgcolor__header">
     <div class="divider">
       <div class="lmr">
-        <h2 class="single__title">{{ .Title }}</h2>
+        <h2 class="title">{{ .Title }}</h2>
       </div>
     </div>
   </div>