:sparkles: Move sidebar content to data

3 files changed, 20 insertions, 14 deletions

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b4df0e0..cc16d29 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -23,9 +23,9 @@
 			<!-- Main -->
 			<div id="main-wrapper">
 				<div class="container">
-					{{ if and (or (eq .Site.Params.Sidebar.position "left") (eq .Site.Params.Sidebar.position "right")) (not (eq .Params.hidesidebar true)) }}
+					{{ if and (or (eq .Site.Data.sidebar.content.position "left") (eq .Site.Data.sidebar.content.position "right")) (not (eq .Params.hidesidebar true)) }}
 					<div class="row">
-						{{ if eq .Site.Params.Sidebar.position "left" }}
+						{{ if eq .Site.Data.sidebar.content.position "left" }}
 						<div class="4u 12u(mobile)">
 							{{ partial "post/sidebar" . }}
 						</div>
@@ -33,7 +33,7 @@
 						<div class="8u 12u(mobile)">
 							{{ partial "post/content.html" . }}
 						</div>
-						{{ if eq .Site.Params.Sidebar.position "right" }}
+						{{ if eq .Site.Data.sidebar.content.position "right" }}
 						<div class="4u 12u(mobile)">
 							{{ partial "post/sidebar" . }}
 						</div>
diff --git a/layouts/partials/footer/contact.html b/layouts/partials/footer/contact.html
index 5ff160b..06bde75 100644
--- a/layouts/partials/footer/contact.html
+++ b/layouts/partials/footer/contact.html
@@ -11,12 +11,16 @@
         </p>
     </li>
     {{ end }}
+    {{ if .Site.Data.footer.contactinfo.email }}
     <li>
         <h3>Mail</h3>
-        <p><a href="mailto:{{ .Site.Params.Contact.email }}">{{ .Site.Params.Contact.email }}</a></p>
+        <p><a href="mailto:{{ .Site.Data.footer.contactinfo.email }}">{{ .Site.Data.footer.contactinfo.email }}</a></p>
     </li>
+    {{ end }}
+    {{ if .Site.Data.footer.contactinfo.email }}
     <li>
         <h3>Phone</h3>
-        <p>{{ .Site.Params.Contact.phone }}</p>
+        <p>{{ .Site.Data.footer.contactinfo.phone }}</p>
     </li>
+    {{ end }}
 </ul>
\ No newline at end of file
diff --git a/layouts/partials/post/sidebar.html b/layouts/partials/post/sidebar.html
index 90a93ef..63b70e4 100644
--- a/layouts/partials/post/sidebar.html
+++ b/layouts/partials/post/sidebar.html
@@ -1,28 +1,30 @@
-{{ $sidebar := .Site.Params.Sidebar }}
+{{ $sidebar := .Site.Data.sidebar.content }}
+{{ $sidebarsection1 := index $sidebar.sections 0 }}
+{{ $sidebarsection2 := index $sidebar.sections 1 }}
 <!-- Sidebar -->
 <section class="box">
-    {{ if $sidebar.image1 }}
-    <a href="{{ $sidebar.imagelink1 }}" class="image featured"><img src="{{ .Site.BaseURL }}{{ $sidebar.image1 }}" alt="" /></a>
+    {{ if $sidebarsection1.image }}
+    <a href="{{ $sidebarsection1.imagelink }}" class="image featured"><img src="{{ .Site.BaseURL }}{{ $sidebarsection1.image }}" alt="" /></a>
     {{ end }}
     <header>
-        <h3>{{ $sidebar.title1 }}</h3>
+        <h3>{{ $sidebarsection1.title }}</h3>
     </header>
-    <p>{{ $sidebar.description1 }}</p>
+    <p>{{ $sidebarsection1.description }}</p>
     <footer>
-        <a href="{{ $sidebar.buttonlink1 }}" class="button alt">{{ $sidebar.buttontext1 }}</a>
+        <a href="{{ $sidebarsection1.buttonlink }}" class="button alt">{{ $sidebarsection1.buttontext }}</a>
     </footer>
 </section>
 <section class="box">
     <header>
-        <h3>{{ $sidebar.title2 }}</h3>
+        <h3>{{ $sidebarsection2.title }}</h3>
     </header>
-    <p>{{ $sidebar.description2 }}</p>
+    <p>{{ $sidebarsection2.description }}</p>
     <ul class="divided">
         {{ range first 4 (where .Site.Pages "Type" .Site.Params.Blog.foldername) }}
         <li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
         {{ end }}
     </ul>
     <footer>
-        <a href="{{ $sidebar.buttonlink2 }}" class="button alt">{{ $sidebar.buttontext2 }}</a>
+        <a href="{{ $sidebarsection2.buttonlink }}" class="button alt">{{ $sidebarsection2.buttontext }}</a>
     </footer>
 </section>
\ No newline at end of file