Use baseof temple to dry code

author: Hanzei <hanzei@mailbox.org> 2018-07-01 11:09:29 +0300
committer: Hanzei <hanzei@mailbox.org> 2018-07-01 11:09:29 +0300
commit: daca1fe109da3b57005cfe77c27819f9666c646d (patch)
tree: 98da048782aae45ddf79463e73969c3fbef67ec1 /layouts/blog
parent: 11587f7efe568e46075321af7f4a1bec54a6ae04 (diff)
2 files changed, 79 insertions, 110 deletions
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 9c162f7..fe351b6 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -1,50 +1,34 @@
-{{ partial "header.html" . }}
-<body>
-<!-- Parent section -->
-<div class="section" id="top">
-    <!-- Begin Title -->
-    <div class="container hero {{ if .Site.Params.fadeIn | default true }}fade-in one{{ end }}">
-        <h1 class="bold-title is-1">{{ .Title }}</h1>
+{{ define "main" }}
+    <div class="container markdown top-pad">
+        {{ .Content }}
     </div>
-    <!-- End Title -->
-    <!-- Everything below fades in two! -->
-    <div class="section no-padding {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }}">
-        {{ partial "nav.html" . }}
-        <div class="container markdown {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }} top-pad">
-            {{ .Content }}
-        </div>
-        <!-- Begin Blog container -->
-        <div class="container">
-            {{ if .Site.Params.showLatest }}
-            <h2 class="title is-2 top-pad">{{ i18n "index_blog_latestPosts" . }}</h2>
-            {{ range first 1 .Pages.ByPublishDate.Reverse }}
-            <div class="summary">{{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }}
-                <h3 class="title is-3 strong-post-title">
-                    <a href="{{ .RelPermalink }}">
-                        {{ .Title }}
-                    </a>
-                </h3>
-                <div class="markdown">
-                    {{ .Summary }}
-                    {{ if .Truncated }}
-                    <a href="{{ .RelPermalink }}">{{ i18n "index_blog_readMore" . }}</a>
-                    {{ end }}
-                </div>
+    <div class="container">
+        {{ if .Site.Params.showLatest }}
+        <h2 class="title is-2 top-pad">{{ i18n "index_blog_latestPosts" . }}</h2>
+        {{ range first 1 .Pages.ByPublishDate.Reverse }}
+        <div class="summary">{{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }}
+            <h3 class="title is-3 strong-post-title">
+                <a href="{{ .RelPermalink }}">
+                    {{ .Title }}
+                </a>
+            </h3>
+            <div class="markdown">
+                {{ .Summary }}
+                {{ if .Truncated }}
+                <a href="{{ .RelPermalink }}">{{ i18n "index_blog_readMore" . }}</a>
+                {{ end }}
             </div>
-            {{ end }}
-            {{ end }}
-            <h2 class="title is-2 top-pad">{{ i18n "index_blog_allPosts" . }}</h2>
-            <ul>
-            {{ range .Pages.ByPublishDate.Reverse }}
-                {{ partial "li.html" . }}
-            {{ end }}
-            </ul>
         </div>
-        <!-- End Blog container -->
-        {{ partial "top-icon-with-hr.html" . }}
-        {{ partial "footer.html" . }}
+        {{ end }}
+
+        {{ end }}
+        <h2 class="title is-2 top-pad">{{ i18n "index_blog_allPosts" . }}</h2>
+        <ul>
+        {{ range .Pages.ByPublishDate.Reverse }}
+            <li class="post-item">
+                <span><a href="{{ .Permalink }}">{{ .Title }}</a></span> - <span>{{ .Date.Format (.Site.Params.dateform | default "Jan 02, 2006") }}</span>
+            </li>
+        {{ end }}
+        </ul>
     </div>
-    <!-- End fade in two -->
-</div>
-<!-- End parent section -->
-</body>
+{{ end }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 6a24536..273dcdc 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -1,67 +1,52 @@
-{{ partial "header.html" . }}
-<body>
-<!-- Parent section -->
-<div class="section" id="top">
-    <!-- Begin Title -->
-    <div class="container hero {{ if .Site.Params.fadeIn | default true }}fade-in one{{ end }}">
-        <h1 class="bold-title is-1">{{ (.Site.GetPage "section" "blog").Title }}</h1>
-    </div>
-    <!-- End Title -->
-    <!-- Everything below fades in two! -->
-    <div class="section {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }}">
-        {{ partial "nav.html" . }}
-        <!-- Begin blog title container -->
-        <div class="container {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }}">
-            <h2 class="title is-1 top-pad strong-post-title">
-                <a href="{{ .Permalink }}">{{ .Title }}</a>
-            </h2>
-            <div class="post-data">
-                {{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }} |
-                {{ i18n "blog_readingTime" .ReadingTime }}
-            </div>
-            {{ if .Site.Params.shareButtons }}
-            <div class="blog-share">
-                {{ i18n "blog_shareThis" . }}:
-                {{ if .Site.Params.shareTwitter }}
-                <a class="twitter-share-button" href="https://twitter.com/intent/tweet?text=Read%20{{ .Title }}%20{{ .Permalink }}" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">
-                    <i class="fa fa-twitter"></i>
-                    <span class="hidden">Twitter</span>
-                </a>
-                {{ end }}
-                {{ if .Site.Params.shareFacebook }}
-                <a class="icon-facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}"  onclick="window.open(this.href, 'facebook-share','width=580,height=296');return false;">
-                    <i class="fa fa-facebook"></i>
-                    <span class="hidden">Facebook</span>
-                </a>
-                {{ end }}
-                {{ if .Site.Params.sharePinterest }}
-                <a class="icon-pinterest" href="http://pinterest.com/pin/create/button/?url={{ .Permalink }}{{ if .Params.pinterestMedia }}&amp;media={{ .Site.BaseURL }}{{ .Params.pinterestMedia }}{{ end }}&amp;description={{ .Title | safeHTML}}" onclick="window.open(this.href, 'pinterest-share','width=580,height=296');return false;">
-                    <i class="fa fa-pinterest"></i>
-                    <span class="hidden">Pinterest</span>
-                </a>
-                {{ end }}
-                {{ if .Site.Params.shareGooglePlus }}
-                <a class="icon-google-plus" href="https://plus.google.com/share?url={{ .Permalink }}" onclick="window.open(this.href, 'google-plus-share', 'width=490,height=530');return false;">
-                    <i class="fa fa-google-plus"></i>
-                    <span class="hidden">Google+</span>
-                </a>
-                {{ end }}
-            </div>
-            {{ end }}
-        </div>
-        <!-- End blog title container -->
-        <!-- Begin blog post content -->
-        <div class="container markdown {{ if .Site.Params.fadeIn | default true }}fade-in two{{ end }} top-pad">
-            {{ .Content }}
+{{ define "title" }}
+    <h1 class="bold-title is-1">{{ (.Site.GetPage "section" "blog").Title }}</h1>
+{{ end }}
+
+{{ define "main" }}
+    <div class="container">
+        <h2 class="title is-1 top-pad strong-post-title">
+            <a href="{{ .Permalink }}">{{ .Title }}</a>
+        </h2>
+        <div class="post-data">
+            {{ .Date.Format (.Site.Params.dateForm | default "Jan 02, 2006") }} |
+            {{ i18n "blog_readingTime" .ReadingTime }}
         </div>
-        <!-- End blog post content -->
-        <div class="disqus">
-            {{ template "_internal/disqus.html" . }}
+        {{ if .Site.Params.shareButtons }}
+        <div class="blog-share">
+            {{ i18n "blog_shareThis" . }}:
+            {{ if .Site.Params.shareTwitter }}
+            <a class="twitter-share-button" href="https://twitter.com/intent/tweet?text=Read%20{{ .Title }}%20{{ .Permalink }}" onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">
+                <i class="fa fa-twitter"></i>
+                <span class="hidden">Twitter</span>
+            </a>
+            {{ end }}
+            {{ if .Site.Params.shareFacebook }}
+            <a class="icon-facebook" href="https://www.facebook.com/sharer/sharer.php?u={{ .Permalink }}"  onclick="window.open(this.href, 'facebook-share','width=580,height=296');return false;">
+                <i class="fa fa-facebook"></i>
+                <span class="hidden">Facebook</span>
+            </a>
+            {{ end }}
+            {{ if .Site.Params.sharePinterest }}
+            <a class="icon-pinterest" href="http://pinterest.com/pin/create/button/?url={{ .Permalink }}{{ if .Params.pinterestMedia }}&amp;media={{ .Site.BaseURL }}{{ .Params.pinterestMedia }}{{ end }}&amp;description={{ .Title | safeHTML}}" onclick="window.open(this.href, 'pinterest-share','width=580,height=296');return false;">
+                <i class="fa fa-pinterest"></i>
+                <span class="hidden">Pinterest</span>
+            </a>
+            {{ end }}
+            {{ if .Site.Params.shareGooglePlus }}
+            <a class="icon-google-plus" href="https://plus.google.com/share?url={{ .Permalink }}" onclick="window.open(this.href, 'google-plus-share', 'width=490,height=530');return false;">
+                <i class="fa fa-google-plus"></i>
+                <span class="hidden">Google+</span>
+            </a>
+            {{ end }}
         </div>
-        {{ partial "top-icon-with-hr.html" . }}
-        {{ partial "footer.html" . }}
+        {{ end }}
+    </div>
+    <!-- Begin blog post content -->
+    <div class="container markdown top-pad">
+        {{ .Content }}
+    </div>
+    <!-- End blog post content -->
+    <div class="disqus">
+        {{ template "_internal/disqus.html" . }}
     </div>
-    <!-- End fade in two -->
-</div>
-<!-- End parent section -->
-</body>
+{{ end }}
author	Hanzei <hanzei@mailbox.org>	2018-07-01 11:09:29 +0300
committer	Hanzei <hanzei@mailbox.org>	2018-07-01 11:09:29 +0300
commit	daca1fe109da3b57005cfe77c27819f9666c646d (patch)
tree	98da048782aae45ddf79463e73969c3fbef67ec1 /layouts/blog
parent	11587f7efe568e46075321af7f4a1bec54a6ae04 (diff)