Merge pull request #79 from nathanbiller/fixSinglePages#70

Fix single pages#70

layouts/_default/baseof.html

@@ -12,33 +12,6 @@
     </div>
 
     {{ block "main" . }}
-
-    {{ if .Site.Params.hero }}
-    {{ partial "hero.html" . }}
-    {{ end }}
-
-    {{ if .Site.Params.section1 }}
-    {{ partial "section1.html" . }}
-    {{ end }}
-
-    {{ if .Site.Params.section2 }}
-    {{ partial "section2.html" . }}
-    {{ end }}
-
-    {{ if .Site.Params.section3 }}
-    {{ partial "section3.html" . }}
-    {{ end }}
-
-    {{ if .Site.Params.section4 }}
-    {{ partial "section4.html" . }}
-    {{ end }}
-
-    {{ if .Site.Params.section5 }}
-    {{ partial "section5.html" . }}
-    {{ end }}
-
-    {{ if .Site.Params.footer }}
-    {{ partial "footer.html" . }}
     {{ end }}
 
     <!-- Back To Top Button -->
@@ -47,8 +20,6 @@
     {{ if .Site.Params.sidebar }}
     {{ partial "sidebar.html" . }}
     {{ end }}
-    
-    {{ end }}
 
     {{ partial "javascript.html" . }}
   </body>

layouts/_default/single.html

@@ -15,6 +15,10 @@
 
     {{ partial "single/single.html" . }}
 
+    {{ if .Params.include_footer }}
+    {{ partial "footer.html" . }}
+    {{ end }}
+
     <!-- Back To Top Button -->
     <div id="backtotop"><a href="#"></a></div>
 

layouts/index.html

@@ -1,2 +1,37 @@
 {{ define "main" }}
+    {{ if .Site.Params.hero }}
+    {{ partial "hero.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section1 }}
+    {{ partial "section1.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section2 }}
+    {{ partial "section2.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section3 }}
+    {{ partial "section3.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section4 }}
+    {{ partial "section4.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section5 }}
+    {{ partial "section5.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.footer }}
+    {{ partial "footer.html" . }}
+    {{ end }}
+
+    <!-- Back To Top Button -->
+    <div id="backtotop"><a href="#"></a></div>
+
+    {{ if .Site.Params.sidebar }}
+    {{ partial "sidebar.html" . }}
+    {{ end }}
+    
 {{ end }}