optimize templating (#2)

jmau111 · Aug 18, 2021 · b864715 · b864715
1 parent 8b319dc
commit b864715
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -124,7 +124,8 @@ If you don't set anything then the theme display the default image "https://raw.
 A lot of stuff, including:
 
 * i18n
-* shortcodes
+* more shortcodes
+* author box 
 
 But still, it's not a multi-purpose theme.
 

diff --git a/layouts/404.html b/layouts/404.html
@@ -1,5 +1,5 @@
-
 <!DOCTYPE html>
+<!-- copied from https://dev.to/404 -->
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -31,26 +31,44 @@
       <link rel="stylesheet" href="{{ ($style | minify | fingerprint).RelPermalink }}">
     {{- end }}
 
+    <!-- block additional styles in templates -->
     {{ block "stylesheets" . }}{{ end }}
+    <!-- /block additional styles in templates  -->
   </head>
+
   <body class='{{ block "body_classes" . }}{{ end }}'>
 
     {{ partial "header.html" . }}
 
     <main class="site-main">
-      {{ block "main" . }}{{ end }}
+      <!-- let's keep a way to override the whole structure by 
+      redefining the whole block main -->
+      {{ block "main" . }}
+        <article>
+          {{- block "subheader" . }}
+            {{ partial "subheader.html" (dict "context" . "site" $.Site) }}
+          {{ end }}
+          <div class="content slide-invert">
+            {{- block "content" . }}{{ end }}
+          </div>
+        </article>
+      {{ end }}
     </main>
-    {{ partial "footer.html" . }}
+
+    {{ partialCached "footer.html" . }}
 
     {{ $prefixFree := resources.Get "js/prefixfree.js" }}
+
+    <!-- block additional scripts in templates -->
     {{ block "scripts" . }}{{ end }}
+    <!-- block additional scripts in templates -->
 
     {{- if .Site.IsServer }}
       <script src="{{ $prefixFree.RelPermalink }}" defer="defer"></script>
     {{- else }}
       <script src="{{ ($prefixFree | minify | fingerprint).RelPermalink }}"></script>
     {{- end }}
 
-    {{ partial "google-analytics.html" . }}
+    {{ partialCached "google-analytics.html" . .Site.Params.ga_id }}
   </body>
 </html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -1,16 +1,11 @@
 {{ define "body_classes" }}list{{ end }}
 
-{{- define "main" }}
-  <article>
-    {{ partial "subheader.html" (dict "context" . "site" $.Site) }}
-    <div class="content slide-invert">
-      <ul class="listing-posts">
-        {{ $paginator := .Paginate (.Pages) }}
-        {{ range $paginator.Pages }}
-            {{ partial "summary" . }}
-        {{ end }}
-      </ul>
-      {{ template "_internal/pagination.html" . }}
-    </div>
-  </article>
+{{ define "content" }}
+  <ul class="listing-posts">
+    {{ $paginator := .Paginate (.Pages) }}
+    {{ range $paginator.Pages }}
+        {{ partial "summary" . }}
+    {{ end }}
+  </ul>
+  {{ template "_internal/pagination.html" . }}
 {{- end }}
diff --git a/layouts/_default/page.html b/layouts/_default/page.html
@@ -1,10 +1,5 @@
 {{ define "body_classes" }}page{{ end }}
 
-{{- define "main" }}
-  <article>
-    {{ partial "subheader.html" (dict "context" . "site" $.Site) }}
-    <div class="content slide-invert">
-      {{ .Content }}
-    </div>
-  </article>
+{{- define "content" }}
+  {{ .Content }}
 {{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -1,10 +1,5 @@
 {{ define "body_classes" }}page{{ end }}
 
-{{- define "main" }}
-  <article>
-    {{ partial "subheader.html" (dict "context" . "site" $.Site) }}
-    <div class="content slide-invert">
-      {{ .Content }}
-    </div>
-  </article>
+{{- define "content" }}
+  {{ .Content }}
 {{- end }}
diff --git a/layouts/index.html b/layouts/index.html
@@ -1,11 +1,10 @@
 {{ define "body_classes" }}home{{ end }}
 
-{{- define "main" }}
-    <article>
-        {{ partial "subheader.html" (dict "context" . "site" $.Site "isHome" true) }}
-        <div class="content slide-invert">
-            {{ .Content }}
-            {{ partial "welcome.html" . }}
-        </div>
-    </article>
+{{- define "subheader" }}
+    {{ partial "subheader.html" (dict "context" . "site" $.Site "isHome" true) }}
+{{- end }}
+
+{{- define "content" }}
+    {{ .Content }}
+    {{ partial "welcome.html" . }}
 {{- end }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
@@ -1,11 +1,10 @@
 {{ define "body_classes" }}single{{ end }}
 
-{{- define "main" }}
-  <article>
-    {{ $date := partial "date.html" . }}
-    {{ partial "subheader.html" (dict "context" . "date" $date "site" $.Site) }}
-    <div class="content slide-invert">
-      {{ .Content }}
-    </div>
-  </article>
+{{- define "subheader" }}
+  {{ $date := partial "date.html" . }}
+  {{ partial "subheader.html" (dict "context" . "date" $date "site" $.Site) }}
+{{- end }}
+
+{{- define "content" }}
+  {{ .Content }}
 {{- end }}
diff --git a/layouts/section/.gitkeep b/layouts/section/.gitkeep