Merge pull request #11 from mazgi/improve-layoutv0.0.2

Improve layout

9 files changed, 153 insertions, 36 deletions

diff --git a/layouts/404.html b/layouts/404.html
index e69de29..4436a15 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -0,0 +1,18 @@
+{{ partial "header.html" . }}
+<div class="row">
+  <div class="col-lg-9">
+    <h1>404</h1>
+  </div>
+  <div class="col-lg-3">
+    <h4>Recents</h4>
+    <ul>
+      {{ $recents := .Site.Pages | first 8 }}
+      {{ with $recents }}
+      {{ range . }}
+      <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+      {{ end }}
+      {{ end }}
+    </ul>
+  </div>
+</div>
+{{ partial "footer.html" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 325c335..0c89331 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,23 +3,27 @@
   <div class="col-lg-9">
     {{ $paginator := .Paginate ( .Data.Pages ) }}
     {{ range $idx, $page := $paginator.Pages }}
+    {{ if $page.Section }}
     <article>
       <div class="row">
-        <h1><a href="{{ .RelPermalink}}">{{ .Title }}</a></h1>
+        <h3><a href="{{ .RelPermalink}}">{{ .Title }}</a></h3>
       </div>
-      {{ .Content }}
+      {{ with .Params.Tags }}
+      <div class="row">
+        {{ range . }}
+        <a class="ml-1 badge badge-pill badge-secondary" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+        {{ end }}
+      </div>
+      {{ end }}
+      {{ .Summary }}
     </article>
-    {{ if lt (add $idx 1) (len $paginator.Pages) }}
     <hr/>
     {{ end }}
     {{ end }}
+    {{ partial "pagination.html" . }}
   </div>
   <div class="col-lg-3">
-    <ul>
-      {{ range .Data.Pages }}
-      <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
-      {{ end }}
-    </ul>
+    {{ partial "sidebar.html" . }}
   </div>
 </div>
 {{ partial "footer.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d3c8ad0..1b01b45 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,10 +1,15 @@
 {{ partial "header.html" . }}
 <div class="row">
-  <article class="col-lg-12">
-    <div class="row">
-      <h1>{{ .Title }}</h1>
-    </div>
-    {{ .Content }}
-  </article>
+  <div class="col-lg-9">
+    <article>
+      <div class="row">
+        <h1>{{ .Title }}</h1>
+      </div>
+      {{ .Content }}
+    </article>
+  </div>
+  <div class="col-lg-3">
+    {{ partial "sidebar.html" . }}
+  </div>
 </div>
 {{ partial "footer.html" . }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
new file mode 100644
index 0000000..e4580ed
--- /dev/null
+++ b/layouts/_default/terms.html
@@ -0,0 +1,16 @@
+{{ partial "header.html" . }}
+<div class="row">
+  <div class="col-lg-9">
+    {{ $plural := .Data.Plural }}
+    {{ range $key, $value := .Data.Terms }}
+    <a class="m-1 btn btn-lg btn-secondary badge-pill" href="{{ "/" | relLangURL}}{{ $plural }}/{{ $key | urlize }}">
+      {{ $key }}
+      <span class="badge badge-light">{{ len $value }}</span>
+    </a>
+    {{ end }}
+  </div>
+  <div class="col-lg-3">
+    {{ partial "sidebar.html" . }}
+  </div>
+</div>
+{{ partial "footer.html" . }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 0566ae6..c06e0d9 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <!-- Font Awesome CDN: https://www.bootstrapcdn.com/fontawesome/ -->
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+    <link rel="stylesheet" href="{{ "/common/site.css" | relURL }}">
     <!-- Open Graph: https://developers.facebook.com/docs/plugins/share-button -->
     {{ if .Page.IsHome }}
     <title>{{ .Site.Title }}</title>
@@ -29,17 +30,35 @@
     {{ end }}
     {{ end }}
     <meta name="twitter:card"       content="summary" />
-    {{ if .Site.Params.SNS.Twitter }}
-    <meta name="twitter:site"       content="@{{ $.Site.Params.SNS.Twitter }}" />
+    {{ with $.Site.Params.Twitter }}
+    <meta name="twitter:site"       content="@{{ . }}" />
     {{ end }}
     <!-- /Open Graph -->
   </head>
   <body>
     <header class="navbar navbar-expand-lg navbar-dark bg-dark">
+      {{ if $.Site.Params.SNS }}
+      <span class="navbar-text mr-1">I am on</span>
+      {{ end }}
       <ul class="navbar-nav">
-        {{ if .Site.GetPage "page" "about.md" }}
+        {{ with $.Site.Params.SNS.GitHub }}
         <li class="nav-item">
-          <a class="nav-link" href="{{ (.Site.GetPage "page" "about.md").RelPermalink }}">about</a>
+          <a class="nav-link" target="github_{{ . }}" href="https://github.com/{{ . }}">GitHub<i class="ml-1 fab fa-github"></i></a>
+        </li>
+        {{ end }}
+        {{ with $.Site.Params.SNS.Twitter }}
+        <li class="nav-item">
+          <a class="nav-link" target="twitter_{{ . }}" href="https://twitter.com/@{{ . }}">Twitter<i class="ml-1 fab fa-twitter"></i></a>
+        </li>
+        {{ end }}
+        {{ with .Site.Params.SNS.Instagram }}
+        <li class="nav-item">
+          <a class="nav-link" target="instagram_{{ . }}" href="https://www.instagram.com/{{ . }}">Instagram<i class="ml-1 fab fa-instagram"></i></a>
+        </li>
+        {{ end }}
+        {{ with .Site.Params.SNS.Facebook }}
+        <li class="nav-item">
+          <a class="nav-link" target="facebook_{{ . }}" href="https://www.facebook.com/{{ . }}">Facebook<i class="ml-1 fab fa-facebook"></i></a>
         </li>
         {{ end }}
       </ul>
@@ -69,28 +88,31 @@
           {{ end }}
           {{ if not .IsHome }}
           <li class="nav-item">
-            <span class="nav-link disabled">Updated At: {{ .Date.Format "2006.01.02" }}</span>
+            <span class="nav-link disabled">Updated At: {{ .Lastmod.Format "2006.01.02" }}</span>
           </li>
           {{ end }}
         </ul>
         <!-- /left, right -->
-        <ul class="navbar-nav ml-auto">
-          <li class="nav-item">
-            <a class="nav-link" href="https://twitter.com/share?url={{ .Permalink }}&text={{ .Title }}" target="_blank">tw</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="https://www.facebook.com/sharer.php?u={{ .Permalink }}" target="_blank">fb</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="https://www.linkedin.com/shareArticle?url={{ .Permalink }}&title={{ .Title }}" target="_blank">in</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="https://plusone.google.com/_/+1/confirm?url={{ .Permalink }}" target="_blank">g+</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="https://b.hatena.ne.jp/entry/{{ .Permalink }}" target="_blank">b!</a>
-          </li>
-        </ul>
+        <div class="navbar-nav ml-auto">
+          <span class="navbar-text mr-1">share this page via</span>
+          <ul class="navbar-nav">
+            <li class="nav-item">
+              <a class="nav-link" href="https://twitter.com/share?url={{ .Permalink }}&text={{ .Title }}" target="_blank"><i class="fab fa-twitter"></i></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="https://www.facebook.com/sharer.php?u={{ .Permalink }}" target="_blank"><i class="fab fa-facebook"></i></a></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="https://www.linkedin.com/shareArticle?url={{ .Permalink }}&title={{ .Title }}" target="_blank"><i class="fab fa-linkedin"></i></a></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="https://plusone.google.com/_/+1/confirm?url={{ .Permalink }}" target="_blank"><i class="fab fa-google-plus"></i></a></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="https://b.hatena.ne.jp/entry/{{ .Permalink }}" target="_blank">b!</a>
+            </li>
+          </ul>
+        </div>
         <!-- /right -->
       </div>
     </nav>
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
new file mode 100644
index 0000000..d3dc68c
--- /dev/null
+++ b/layouts/partials/pagination.html
@@ -0,0 +1,18 @@
+{{ $paginator := $.Paginator }}
+{{ if gt $paginator.TotalPages 1 }}
+<nav aria-label="page navidation">
+  <ul class="pagination pagination-sm">
+    <li class="page-item{{ if not $paginator.HasPrev }} disabled{{ end }}">
+      <a class="page-link" href="{{ if $paginator.HasPrev }}{{ $paginator.Prev.URL }}{{ else }}{{ .URL }}{{ end }}">&lt</a>
+    </li>
+    {{ range $paginator.Pagers }}
+    <li class="page-item{{ if eq . $paginator}} active{{ end }}">
+      <a class="page-link" href="{{ .URL }}">{{ .PageNumber }}{{ if eq . $paginator}}<span class="sr-only"></span>{{ end }}</a>
+    </li>
+    {{ end }}
+    <li class="page-item{{ if not $paginator.HasNext }} disabled{{ end }}">
+      <a class="page-link" href="{{ if $paginator.HasNext }}{{ $paginator.Next.URL }}{{ else }}{{ .URL }}{{ end }}">&gt</a>
+    </li>
+  </ul>
+</nav>
+{{ end }}
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
new file mode 100644
index 0000000..d8f3b31
--- /dev/null
+++ b/layouts/partials/sidebar.html
@@ -0,0 +1,33 @@
+<div class="sidebar">
+  {{ with ( .Site.GetPage "page" "about" ) }}
+  <h4><a href="{{ .RelPermalink }}">{{ .Title }}</a></h4>
+  {{ .Summary }}
+  <hr />
+  {{ end }}
+  {{ if not .IsNode }}
+  <h4><a href="{{ "/tags/" | relLangURL }}">Tags</a></h4>
+  {{ with .Params.Tags }}
+  <div>
+    {{ range . }}
+    <a class="badge badge-pill badge-secondary" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+    {{ end }}
+  </div>
+  {{ end }}
+  <hr />
+  {{ end }}
+  <h4><a href="{{ "/categories/" | relLangURL }}">Categories</a></h4>
+  {{ with .Site.Taxonomies.categories }}
+  <div>
+    <ul>
+      {{ range $key, $value := . }}
+      <li>
+        <a href="{{ "/categories/" | relLangURL }}{{ $key | urlize }}">
+          {{ $key | humanize }}
+          <span class="badge badge-pill badge-light">{{ len $value }}</span>
+        </a>
+      </li>
+      {{ end }}
+    </ul>
+  </div>
+  {{ end }}
+</div>
diff --git a/layouts/robots.txt b/layouts/robots.txt
new file mode 100644
index 0000000..7d329b1
--- /dev/null
+++ b/layouts/robots.txt
@@ -0,0 +1 @@
+User-agent: *
diff --git a/static/common/site.css b/static/common/site.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/static/common/site.css