some catgories

5 files changed, 56 insertions, 7 deletions

diff --git a/themes/new_theme/layouts/_default/list.html b/themes/new_theme/layouts/_default/list.html
index 68776c6..1657fd0 100644
--- a/themes/new_theme/layouts/_default/list.html
+++ b/themes/new_theme/layouts/_default/list.html
@@ -2,7 +2,7 @@
 
 {{ $section := .Section }}
 
-{{ if ne $section "blog" }}
+{{ if and ( ne $section "blog" ) ( ne $section "" ) }}
 <div class="main-content content" role="main" itemprop="mainContentOfPage">
 	<article class="post">
 		<header class="post__header clearfix">
@@ -39,8 +39,8 @@
 						<time class="loop__meta-date" datetime="{{ .Date }}">{{.Date.Format "January 02, 2006"}}</time>
 					</div>
 				</header>
-				<div class="loop__excerpt">
-					{{ .Summary }}
+				<div class="loop__excerpt post__content">
+					{{ .Summary | markdownify }}
 				</div>
 				<div class="post__content">
 					<a href="{{ .URL }}">View full post</a>
diff --git a/themes/new_theme/layouts/_default/single.html b/themes/new_theme/layouts/_default/single.html
index a3e40bb..77fbd4a 100644
--- a/themes/new_theme/layouts/_default/single.html
+++ b/themes/new_theme/layouts/_default/single.html
@@ -1,15 +1,48 @@
 {{ partial "header.html" . }}
 
+{{ $section := .Section }}
+
+{{ if ne $section "blog" }}
+<div class="main-content content" role="main" itemprop="mainContentOfPage">
+	<article class="post">
+		<header class="post__header clearfix">
+			<h1 class="post__title">{{ .Title }}</h1>
+		</header>
+		<div class="post__content clearfix">
+			{{ .Content }}
+		</div>
+	</article>
+</div>
+{{ else }}
 <div class="main-content content" role="main" itemprop="mainContentOfPage">
 	<article class="post">
 		<header class="post__header clearfix">
 			<h1 class="post__title">{{ .Title }}</h1>
+			<p class="post__meta meta">
+				<svg class="icon icon-time" height="14" viewBox="0 0 16 16" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m8-.0000003c-4.4 0-8 3.6-8 8 0 4.4000003 3.6 8.0000003 8 8.0000003 4.4 0 8-3.6 8-8.0000003 0-4.4-3.6-8-8-8zm0 14.4000003c-3.52 0-6.4-2.88-6.4-6.4000003 0-3.52 2.88-6.4 6.4-6.4 3.52 0 6.4 2.88 6.4 6.4 0 3.5200003-2.88 6.4000003-6.4 6.4000003zm.4-10.4000003h-1.2v4.8l4.16 2.5600003.64-1.04-3.6-2.1600003z"/></svg>
+				<time class="post__meta-date" datetime="{{ .Date }}">{{.Date.Format "January 02, 2006"}}</time>
+				{{- if .Params.categories }}
+				<span class="post__meta-categories meta-categories">
+					<svg class="icon icon-category" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 2l1 2h8v11h-16v-13z"/></svg>
+					{{ range $index, $category := .Params.categories }}{{ if gt $index 0 }}, {{ end }}<a class="meta-categories__link" href="{{ "/categories/" | relLangURL }}{{ . | urlize | lower }}" rel="category">{{ . }}</a>{{ end }}</span>
+				{{- end }}
+			</p>
 		</header>
 		<div class="post__content clearfix">
+			{{- if .Params.thumbnail }}
+			<figure class="post__thumbnail">
+				<img src="{{ .Params.thumbnail | absURL }}" alt="{{ .Title }}">
+			</figure>
+			{{- end }}
 			{{ .Content }}
 		</div>
+		{{ partial "post_tags.html" . }}
 	</article>
+	{{ partial "authorbox.html" . }}
+	{{ partial "post_nav.html" . }}
+	{{ partial "comments.html" . }}
 </div>
+{{ end }}
 
 {{ partial "sidebar.html" . }}
 {{ partial "footer.html" . }}
diff --git a/themes/new_theme/layouts/partials/sidebar.html b/themes/new_theme/layouts/partials/sidebar.html
index ce306a0..0179264 100644
--- a/themes/new_theme/layouts/partials/sidebar.html
+++ b/themes/new_theme/layouts/partials/sidebar.html
@@ -3,7 +3,7 @@
 	{{ $section := .Section }}
 	{{ if eq $section "blog" }}
 		{{ partial "widgets/recent.html" . }}
+		{{ partial "widgets/categories.html" . }}
+		{{ partial "widgets/taglist.html" . }}
 	{{ end }}
-	{{ partial "widgets/categories.html" . }}
-	{{ partial "widgets/taglist.html" . }}
 </aside>
diff --git a/themes/new_theme/layouts/partials/widgets/categories.html b/themes/new_theme/layouts/partials/widgets/categories.html
index d4ace88..506cb1f 100644
--- a/themes/new_theme/layouts/partials/widgets/categories.html
+++ b/themes/new_theme/layouts/partials/widgets/categories.html
@@ -2,7 +2,7 @@
 {{- if isset .Site.Taxonomies "categories" }}
 {{- if not (eq (len .Site.Taxonomies.categories) 0) }}
 <div class="widget-categories widget">
-	<h4 class="widget__title">Categories</h4>
+	<h4 class="widget__title"><a href="/categories/">Categories</a></h4>
 	<div class="widget__content">
 		<ul class="widget__list">
 			{{- range $name, $items := .Site.Taxonomies.categories }}
@@ -13,4 +13,4 @@
 </div>
 {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/themes/new_theme/layouts/taxonomy/category.terms.html b/themes/new_theme/layouts/taxonomy/category.terms.html
new file mode 100644
index 0000000..664a1b8
--- /dev/null
+++ b/themes/new_theme/layouts/taxonomy/category.terms.html
@@ -0,0 +1,16 @@
+{{ partial "header.html" . }}
+
+<section id="main">
+  <div>
+    <h1 id="title">{{ .Title }}</h1>
+
+    <ul>
+    {{ $data := .Data }}
+    {{ range $key, $value := .Data.Terms }}
+      <li><a href="/{{ $data.Plural }}/{{ $key | urlize }}">{{ $key }}</a> {{ len $value }}</li>
+    {{ end }}
+   </ul>
+  </div>
+</section>
+
+{{ partial "footer.html" . }}