From 6df0a4eff83f9fa8a2766adc0d0f0bc7d43f0104 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 14 Jul 2017 22:10:18 +0100
Subject: [PATCH] More complicated way of getting summary and subtitle

---
 layouts/index.html                    |  6 +++---
 layouts/partials/box.html             |  2 +-
 layouts/partials/box_image.html       |  2 +-
 layouts/partials/content.html         | 10 +---------
 layouts/partials/subtitle_string.html |  7 +++++++
 layouts/partials/summary_string.html  | 14 ++++++++++++++
 6 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 layouts/partials/subtitle_string.html
 create mode 100644 layouts/partials/summary_string.html

diff --git a/layouts/index.html b/layouts/index.html
index 0fd1e65..41b3f90 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -21,7 +21,7 @@
               <h3>Blog</h3>
             </a>
   					<p>
-                {{ .Params.summary | default .Summary | truncate .Site.Params.summary_length_long "..." }}
+							{{ partial "summary_string.html" . }}
             </p>
           {{ end }}
 				</section>
@@ -32,7 +32,7 @@
     					<h3>Projects</h3>
             </a>
   					<p>
-              {{ .Params.summary | default .Summary | truncate .Site.Params.summary_length_long "..." }}
+							{{ partial "summary_string.html" . }}
             </p>
           {{ end }}
 				</section>
@@ -45,7 +45,7 @@
               <h3>Setup</h3>
             </a>
   					<p>
-							{{ .Params.summary | default .Summary | truncate .Site.Params.summary_length_long "..." }}
+							{{ partial "summary_string.html" . }}
             </p>
           {{ end }}
 				</section>
diff --git a/layouts/partials/box.html b/layouts/partials/box.html
index 11d8b55..cd408fb 100644
--- a/layouts/partials/box.html
+++ b/layouts/partials/box.html
@@ -3,6 +3,6 @@
     <a href="{{ .Permalink }}">
       <h3>{{ title .LinkTitle }}</h3>
     </a>
-    <p>{{ .Params.summary | default .Summary | truncate .Site.Params.summary_length "..." }}</p>
+    {{ partial "summary_string.html" . }}
   </section>
 </div>
diff --git a/layouts/partials/box_image.html b/layouts/partials/box_image.html
index 1d18f22..cb9fd45 100644
--- a/layouts/partials/box_image.html
+++ b/layouts/partials/box_image.html
@@ -8,6 +8,6 @@
     <a href="{{ .Permalink }}">
       <h3>{{ title .LinkTitle }}</h3>
     </a>
-    <p>{{ .Params.summary | default .Summary | truncate .Site.Params.summary_length "..." }}</p>
+    {{ partial "summary_string.html" . }}
   </section>
 </div>
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
index cc31bf2..efca1b0 100644
--- a/layouts/partials/content.html
+++ b/layouts/partials/content.html
@@ -1,14 +1,6 @@
 <header>
   <h2>{{ title .Title }}</h2>
-  {{ if .Params.subtitle }}
-    <p>{{ markdownify .Params.subtitle }}</p>
-  {{ else if .Params.repo }}
-    {{ $data := getJSON "https://api.github.com/repos/" .Params.repo }}
-    <p>{{ $data.description }}</p>
-  {{ else if .Params.gist }}
-    {{ $data := getJSON "https://api.github.com/gists/" .Params.gist }}
-    <p>{{ $data.description }}</p>
-  {{ end }}
+  <p>{{ partial "subtitle_string.html" . }}</p>
 </header>
 {{ if .Content }}
   <div class="box">
diff --git a/layouts/partials/subtitle_string.html b/layouts/partials/subtitle_string.html
new file mode 100644
index 0000000..4275d61
--- /dev/null
+++ b/layouts/partials/subtitle_string.html
@@ -0,0 +1,7 @@
+{{ if .Params.subtitle }}
+  {{ .Params.subtitle | markdownify }}
+{{ else if .Params.repo }}
+  {{ (getJSON "https://api.github.com/repos/" .Params.repo).description }}
+{{ else if .Params.gist }}
+  {{ (getJSON "https://api.github.com/gists/" .Params.gist).description }}
+{{ end }}
diff --git a/layouts/partials/summary_string.html b/layouts/partials/summary_string.html
new file mode 100644
index 0000000..7f0f091
--- /dev/null
+++ b/layouts/partials/summary_string.html
@@ -0,0 +1,14 @@
+{{ if eq .Section "posts" }}
+  {{ .Summary | truncate .Site.Params.summary_length "..." }}
+{{ else }}
+
+  {{ if .Params.subtitle }}
+    {{ .Params.subtitle | markdownify }}
+  {{ else if .Params.repo }}
+    {{ (getJSON "https://api.github.com/repos/" .Params.repo).description }}
+  {{ else if .Params.gist }}
+    {{ (getJSON "https://api.github.com/gists/" .Params.gist).description }}
+  {{ else }}
+    {{ .Summary | truncate .Site.Params.summary_length "..." }}
+  {{ end }}
+{{ end }}