From e49918d911771db616f49952959d105e232f75b8 Mon Sep 17 00:00:00 2001
From: Curtis Timson <curt@live.co.uk>
Date: Sat, 24 Feb 2018 10:00:15 +0000
Subject: :sparkles: Move address to data from config

---
 exampleSite/config-prod.toml             |  5 -----
 exampleSite/config.toml                  |  5 -----
 exampleSite/data/footer/contactinfo.yaml |  6 ++++++
 layouts/partials/footer/contact.html     | 22 ++++++++++++++++++++++
 layouts/partials/footer/index.html       | 19 +------------------
 5 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 exampleSite/data/footer/contactinfo.yaml
 create mode 100644 layouts/partials/footer/contact.html

diff --git a/exampleSite/config-prod.toml b/exampleSite/config-prod.toml
index 5b4c8b9..2eb29b0 100644
--- a/exampleSite/config-prod.toml
+++ b/exampleSite/config-prod.toml
@@ -18,11 +18,6 @@ theme = "../.."
     postsperpage = "6"
     foldername = "blog"
 
-[params.address]
-    line1 = "Untitled Incorporated"
-    line2 = "1234 Somewhere Road Suite"
-    line3 = "Nashville, TN 00000-0000"
-
 [params.contact]
     email = "someone@untitled.tld"
     phone = "(800) 000-0000"
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 9368bec..de311e5 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -18,11 +18,6 @@ theme = "../.."
     postsperpage = "6"
     foldername = "blog"
 
-[params.address]
-    line1 = "Untitled Incorporated"
-    line2 = "1234 Somewhere Road Suite"
-    line3 = "Nashville, TN 00000-0000"
-
 [params.contact]
     email = "someone@untitled.tld"
     phone = "(800) 000-0000"
diff --git a/exampleSite/data/footer/contactinfo.yaml b/exampleSite/data/footer/contactinfo.yaml
new file mode 100644
index 0000000..4d3d11b
--- /dev/null
+++ b/exampleSite/data/footer/contactinfo.yaml
@@ -0,0 +1,6 @@
+addresslines:
+- line: 'Untitled Incorporated'
+
+- line: '1234 Somewhere Road Suite'
+
+- line: 'Nashville, TN 00000-0000'
diff --git a/layouts/partials/footer/contact.html b/layouts/partials/footer/contact.html
new file mode 100644
index 0000000..5ff160b
--- /dev/null
+++ b/layouts/partials/footer/contact.html
@@ -0,0 +1,22 @@
+<ul class="contact">
+    {{ if .Site.Data.footer.contactinfo.addresslines }}
+    <li>
+        <h3>Address</h3>
+        <p>
+            
+            {{ range $i, $e := .Site.Data.footer.contactinfo.addresslines }}
+            {{ if $i }} <br/> {{ end }} {{ .line }}
+            {{ end }}
+
+        </p>
+    </li>
+    {{ end }}
+    <li>
+        <h3>Mail</h3>
+        <p><a href="mailto:{{ .Site.Params.Contact.email }}">{{ .Site.Params.Contact.email }}</a></p>
+    </li>
+    <li>
+        <h3>Phone</h3>
+        <p>{{ .Site.Params.Contact.phone }}</p>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/layouts/partials/footer/index.html b/layouts/partials/footer/index.html
index 39404f9..806ad28 100644
--- a/layouts/partials/footer/index.html
+++ b/layouts/partials/footer/index.html
@@ -51,24 +51,7 @@
                         <h2>{{ (index .Site.Data.footer.content.sections 4).title }}</h2>
                     </header>
                     {{ partial "footer/social.html" . }}
-                    <ul class="contact">
-                        <li>
-                            <h3>Address</h3>
-                            <p>
-                                {{ .Site.Params.Address.line1 }}<br />
-                                {{ .Site.Params.Address.line2 }}<br />
-                                {{ .Site.Params.Address.line3 }}
-                            </p>
-                        </li>
-                        <li>
-                            <h3>Mail</h3>
-                            <p><a href="mailto:{{ .Site.Params.Contact.email }}">{{ .Site.Params.Contact.email }}</a></p>
-                        </li>
-                        <li>
-                            <h3>Phone</h3>
-                            <p>{{ .Site.Params.Contact.phone }}</p>
-                        </li>
-                    </ul>
+                    {{ partial "footer/contact.html" . }}
                 </section>
             </div>
         </div>
-- 
cgit v1.2.3