Reverted changes for the best working solution for #208

7 files changed, 8 insertions, 46 deletions

diff --git a/layouts/partials/content-type/article.html b/layouts/partials/content-type/article.html
index 3c86527..43913c0 100644
--- a/layouts/partials/content-type/article.html
+++ b/layouts/partials/content-type/article.html
@@ -4,12 +4,6 @@
 
 <article class="default article">
     {{ partial "featured-image" . }}
-
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
-
+    {{ partial "default-content" . }}
     {{ partial "article-footer" . }}
 </article>
diff --git a/layouts/partials/content-type/audio.html b/layouts/partials/content-type/audio.html
index eaff31d..4ae0be1 100644
--- a/layouts/partials/content-type/audio.html
+++ b/layouts/partials/content-type/audio.html
@@ -30,11 +30,6 @@
     </div>
     {{ end }}
 
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
-
+    {{ partial "default-content" . }}
     {{ partial "article-footer" . }}
 </article>
diff --git a/layouts/partials/content-type/code.html b/layouts/partials/content-type/code.html
index c266500..3cba019 100644
--- a/layouts/partials/content-type/code.html
+++ b/layouts/partials/content-type/code.html
@@ -4,12 +4,6 @@
 
 <article class="default article">
     {{ partial "featured-image" . }}
-
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
-
+    {{ partial "default-content" . }}
     {{ partial "article-footer" . }}
 </article>
diff --git a/layouts/partials/content-type/gallery.html b/layouts/partials/content-type/gallery.html
index e2d8df0..8ef30c2 100644
--- a/layouts/partials/content-type/gallery.html
+++ b/layouts/partials/content-type/gallery.html
@@ -29,11 +29,6 @@
     {{ partial "featured-image" . }}
     {{ end }}
 
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
-
+    {{ partial "default-content" . }}
     {{ partial "article-footer" . }}
 </article>
diff --git a/layouts/partials/content-type/page.html b/layouts/partials/content-type/page.html
index 80d5981..3943b45 100644
--- a/layouts/partials/content-type/page.html
+++ b/layouts/partials/content-type/page.html
@@ -4,12 +4,7 @@
 
 <article class="default article">
     {{ partial "featured-image" . }}
-
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
+    {{ partial "default-content" . }}
 
     {{ with .Params.link }}
     <script>window.location = {{ . | relURL }}</script>
diff --git a/layouts/partials/content-type/picture.html b/layouts/partials/content-type/picture.html
index dacdea4..39ed8b6 100644
--- a/layouts/partials/content-type/picture.html
+++ b/layouts/partials/content-type/picture.html
@@ -4,12 +4,6 @@
 
 <article class="picture">
     {{ partial "featured-image" . }}
-
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
-
+    {{ partial "default-content" . }}
     {{ partial "article-footer" . }}
 </article>
diff --git a/layouts/partials/content-type/video.html b/layouts/partials/content-type/video.html
index 93b8f15..cd144b8 100755
--- a/layouts/partials/content-type/video.html
+++ b/layouts/partials/content-type/video.html
@@ -31,12 +31,7 @@
       </video>
     </div>
     {{ end }}
-
-    {{ $PAGE_TYPE := "SINGLE_PAGE"}}
-    {{ if not (.Scratch.Get "singlePage") }}
-        {{ $PAGE_TYPE := "MULTI_PAGE"}}
-    {{ end }}
-    {{ partialCached "default-content" . .Title .Content $PAGE_TYPE }}
-
+    
+    {{ partial "default-content.html" . }}
     {{ partial "article-footer" . }}
 </article>