Improve block template

5 files changed, 74 insertions, 86 deletions

diff --git a/layouts/404.html b/layouts/404.html
index 6ba3af1..5a6b937 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,20 +1,18 @@
 {{ define "main" }}
-<section id="main">
-    <article class="article article-type-post" itemscope="" itemprop="blogPost">
-        <div class="article-inner">
-            <div class="article-entry" itemprop="articleBody">
-                <p>
-                    <center>
-                    <h1>
-                        {{with .Site.Data.l10n.page_not_found.title}}{{.}}{{end}}
-                    </h1>
-                    <h3>
-                        {{with .Site.Data.l10n.page_not_found.subtitle}}{{.}}{{end}}
-                    </h3>
-                    </center>
-                </p>
-            </div>
+<article class="article article-type-post" itemscope="" itemprop="blogPost">
+    <div class="article-inner">
+        <div class="article-entry" itemprop="articleBody">
+            <p>
+                <center>
+                <h1>
+                    {{with .Site.Data.l10n.page_not_found.title}}{{.}}{{end}}
+                </h1>
+                <h3>
+                    {{with .Site.Data.l10n.page_not_found.subtitle}}{{.}}{{end}}
+                </h3>
+                </center>
+            </p>
         </div>
-    </article>
-</section>
+    </div>
+</article>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 7f70065..3644b33 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -8,7 +8,9 @@
     	{{ partialCached "profile" . }}
     {{ end }}
 
-   	{{ block "main" . }}{{ end }}
+    <section id="main">
+    {{ block "main" . }}{{ end }}
+    </section>
 
    	{{ if not .Params.disable_widgets }}
     	{{ partial "sidebar" . }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 7f6ea23..170d9ef 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,19 +1,17 @@
 {{ define "main" }}
-<section id="main">
-    <section class="layout-wrap">
-        <div class="layout-title">
-            <span>{{ .Title }}</span>
-        </div>
-        <div class="layout-wrap-inner list-categories">
-            <ul class="category-list">
-                {{ $data := .Data }} {{ range $key, $value := .Data.Terms.ByCount }}
-                <li class="category-list-item">
-                    <a class="category-list-link" href="{{ $value.Name | urlize }}">{{ $value.Name }}</a>
-                    <span class="category-list-count">{{ $value.Count }}</span>
-                </li>
-                {{ end }}
-            </ul>
-        </div>
-    </section>
+<section class="layout-wrap">
+    <div class="layout-title">
+        <span>{{ .Title }}</span>
+    </div>
+    <div class="layout-wrap-inner list-categories">
+        <ul class="category-list">
+            {{ $data := .Data }} {{ range $key, $value := .Data.Terms.ByCount }}
+            <li class="category-list-item">
+                <a class="category-list-link" href="{{ $value.Name | urlize }}">{{ $value.Name }}</a>
+                <span class="category-list-count">{{ $value.Count }}</span>
+            </li>
+            {{ end }}
+        </ul>
+    </div>
 </section>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/article_list.html b/layouts/partials/article_list.html
index df8488d..37d4581 100644
--- a/layouts/partials/article_list.html
+++ b/layouts/partials/article_list.html
@@ -1,31 +1,27 @@
-<section id="main">
-    {{ $paginator := .Paginate (where .Data.Pages "Section" "in" .Site.Params.mainSections) }}
-    {{ range $paginator.Pages }}
-    <article class="article article-type-post" itemscope="" itemprop="blogPost">
-        <div class="article-inner">
-            {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}
-            <a href="{{ .Permalink }}" itemprop="url">
-                <img src="{{ .Params.banner | absURL }}" class="article-banner">
-            {{ end }}
-            </a>
+{{ $paginator := .Paginate (where .Data.Pages "Section" "in" .Site.Params.mainSections) }}
+{{ range $paginator.Pages }}
+<article class="article article-type-post" itemscope="" itemprop="blogPost">
+    <div class="article-inner">
+        {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}
+        <a href="{{ .Permalink }}" itemprop="url">
+            <img src="{{ .Params.banner | absURL }}" class="article-banner">
+        {{ end }}
+        </a>
 
-            {{ partial "article_header" . }}
-            <div class="article-entry" itemprop="articleBody">
-                <p>
-                    {{ printf "%s" .Summary | markdownify }}
-                    <br>
-                </p>
-                <p class="article-more-link">
-                    <a href="{{ .Permalink }}">
-                        {{with .Site.Data.l10n.articles.read_more}}{{.}}{{end}}
-                    </a>
-                </p>
-            </div>
-            {{ partial "article_footer" . }}
+        {{ partial "article_header" . }}
+        <div class="article-entry" itemprop="articleBody">
+            <p>
+                {{ .Description | default .Summary }}
+            </p>
+            <p class="article-more-link">
+                <a href="{{ .Permalink }}">
+                    {{with .Site.Data.l10n.articles.read_more}}{{.}}{{end}}
+                </a>
+            </p>
         </div>
-    </article>
-    {{ end }}
+        {{ partial "article_footer" . }}
+    </div>
+</article>
+{{ end }}
 
-    {{ partial "pagination" . }}
-</section>
-<!-- // main section -->
+{{ partial "pagination" . }}
\ No newline at end of file
diff --git a/layouts/partials/single_article.html b/layouts/partials/single_article.html
index bdb7128..a0a1725 100644
--- a/layouts/partials/single_article.html
+++ b/layouts/partials/single_article.html
@@ -1,29 +1,23 @@
-{{ if .Params.disable_profile | and .Params.disable_widgets }}
-<section id="main" class="full-width">
-{{ else }}
-<section id="main">
-{{ end }}
-    <article id="page-undefined" class="article article-type-page" itemscope="" itemprop="blogPost">
-        <div class="article-inner">
-            {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}
-                <img src="{{ .Params.banner | absURL }}" class="article-banner">
-            {{ end }}
+<article id="page-undefined" class="article article-type-page" itemscope="" itemprop="blogPost">
+    <div class="article-inner">
+        {{ if and (isset .Params "banner") (not (eq .Params.banner "")) }}
+            <img src="{{ .Params.banner | absURL }}" class="article-banner">
+        {{ end }}
 
-            {{ partial "article_header" . }}
-            <div class="article-entry" itemprop="articleBody">
-                {{ .Content }}
-            </div>
-            {{ partial "article_footer" . }}
+        {{ partial "article_header" . }}
+        <div class="article-entry" itemprop="articleBody">
+            {{ .Content }}
         </div>
+        {{ partial "article_footer" . }}
+    </div>
 
-        {{ partial "prev_next_post" . }}
-    </article>
+    {{ partial "prev_next_post" . }}
+</article>
 
-    {{ if and (not (eq .Site.DisqusShortname "")) (not .Params.disable_comments) }}
-    <section id="comments">
-        <div id="disqus_thread">
-            {{ template "_internal/disqus.html" . }}
-        </div>
-    </section>
-    {{ end }}
+{{ if and (not (eq .Site.DisqusShortname "")) (not .Params.disable_comments) }}
+<section id="comments">
+    <div id="disqus_thread">
+        {{ template "_internal/disqus.html" . }}
+    </div>
 </section>
+{{ end }}
\ No newline at end of file