Merge branch 'master' into metadescription

vjeantet · Apr 12, 2017 · 6df6d3f · 6df6d3f
2 parents f9401b6 + 103e4b1
commit 6df6d3f
Show file tree

Hide file tree

Showing 34 changed files with 683 additions and 101 deletions.
diff --git a/archetypes/default.md b/archetypes/default.md
@@ -1,7 +1,5 @@
 +++
-date = "2014-07-11T10:54:24+02:00"
-draft = false
-title = "Post title"
+draft = true
 slug = "post-title"
 tags = ["tag1","tag2"]
 image = ""

diff --git a/layouts/404.html b/layouts/404.html
@@ -1,14 +1,14 @@
 {{ partial "header.html" . }}
 
 {{if .Site.Params.cover}}
-<header class="main-header " style="background-image: url({{.Site.BaseURL}}{{.Site.Params.cover}})">
+<header class="main-header " style="background-image: url({{ .Site.Params.cover | relURL}})">
 {{else}}
 <header class="main-header no-cover">
 {{end}}
 
 <nav class="main-nav overlay clearfix">
         {{ if .Site.Params.logo }}
-            <a class="blog-logo" href="{{ .Permalink }}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Blog Logo" /></a>
+            <a class="blog-logo" href="{{ .Permalink }}"><img src="{{ .Site.Params.logo| relURL }}" alt="Blog Logo" /></a>
         {{end}}
         {{ if .Site.Menus.main }}
             <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -5,20 +5,20 @@
 	{{if or (eq (substr .Params.cover 0 7) "http://") (eq (substr .Params.cover 0 8) "https://")}}
   <header class="main-header tag-head" style="background-image: url({{.Params.cover}})">
   {{ else }}
-  <header class="main-header tag-head" style="background-image: url({{ $baseurl }}{{.Params.cover}})">
+  <header class="main-header tag-head" style="background-image: url({{.Params.cover | relURL}})">
   {{ end }}
 {{else if .Site.Params.cover}}
 	 {{if or (eq (substr .Site.Params.cover 0 7) "http://") (eq (substr .Site.Params.cover 0 8) "https://")}}
   <header class="main-header tag-head" style="background-image: url({{.Site.Params.cover}})">
   {{ else }}
-  <header class="main-header tag-head" style="background-image: url({{ $baseurl }}{{.Site.Params.cover}})">
+  <header class="main-header tag-head" style="background-image: url({{.Site.Params.cover  | relURL}})">
   {{ end }}
 {{else}}
 	<header class="main-header tag-head no-cover">
 {{end}}
     <nav class="main-nav overlay clearfix">
       {{ if .Site.Params.logo }}
-        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Home" /></a>
+        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{ .Site.Params.logo | relURL}}" alt="Home" /></a>
       {{end}}
       {{ if .Site.Menus.main }}
           <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -3,9 +3,9 @@
 
 {{if .Params.image}}
   {{if or (eq (substr .Params.image 0 7) "http://") (eq (substr .Params.image 0 8) "https://")}}
-  <header class="main-header post-head" style="background-image: url({{.Params.image}})">
+  <header class="main-header post-head" style="background-image: url({{.Params.image }})">
   {{ else }}
-  <header class="main-header post-head" style="background-image: url({{ $baseurl }}{{.Params.image}})">
+  <header class="main-header post-head" style="background-image: url({{.Params.image | relURL}})">
   {{ end }}
   <nav class="main-nav overlay clearfix">
 {{else}}
@@ -14,12 +14,12 @@
 {{end}}
 
   {{ if .Site.Params.logo }}
-      <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Home" /></a>
+      <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{ .Site.Params.logo | relURL}}" alt="Home" /></a>
   {{end}}
   {{ if .Site.Menus.main }}
       <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
   {{else}}
-      <a class="menu-button icon-feed" href="{{ .Site.BaseURL }}index.xml">&nbsp;&nbsp;Subscribe</a>
+      <a class="menu-button icon-feed" href="{{ "index.xml"| relURL}}" >&nbsp;&nbsp;Subscribe</a>
   {{end}}
   </nav>
 </header>
@@ -59,7 +59,7 @@ <h1 class="post-title">{{.Title}}</h1>
 
     {{if .Site.Params.logo}}
     <figure class="author-image">
-        <a class="img" href="{{.Site.BaseURL}}" style="background-image: url({{ $baseurl }}{{.Site.Params.logo}})"><span class="hidden">{{.Site.Params.author}}'s Picture</span></a>
+        <a class="img" href="{{.Site.BaseURL}}" style="background-image: url({{.Site.Params.logo | relURL}})"><span class="hidden">{{.Site.Params.author}}'s Picture</span></a>
     </figure>
     {{end}}
 
@@ -73,4 +73,9 @@ <h1 class="post-title">{{.Title}}</h1>
 </article>
 
 </main>
+
+{{if not .Params.hideSuggestions }}
+  {{ partial "suggestions.html" . }}
+{{ end }}
+
 {{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
@@ -4,15 +4,15 @@
 {{if or (eq (substr .Site.Params.cover 0 7) "http://") (eq (substr .Site.Params.cover 0 8) "https://")}}
   <header class="main-header" style="background-image: url({{.Site.Params.cover}})">
   {{ else }}
-  <header class="main-header" style="background-image: url({{.Site.BaseURL}}{{.Site.Params.cover}})">
+  <header class="main-header" style="background-image: url({{.Site.Params.cover | relURL}})">
   {{ end }}
 {{else}}
 <header class="main-header no-cover">
 {{end}}
 
     <nav class="main-nav overlay clearfix">
         {{ if .Site.Params.logo }}
-            <a class="blog-logo" href="{{ .Permalink }}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Blog Logo" /></a>
+            <a class="blog-logo" href="{{ .Permalink }}"><img src="{{ .Site.Params.logo  | relURL}}" alt="Blog Logo" /></a>
         {{end}}
         {{ if .Site.Menus.main }}
             <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
@@ -28,43 +28,55 @@
         <div class="main-header-content inner">
             {{ if .Site.Params.linkedinName }}
                 <a class="bloglogo" href="https://www.linkedin.com/in/{{ .Site.Params.linkedinName }}" target="_blank">
-                    <span class="icon-linkedin" style="color:white;font-size:2em"></span>
+                    <span class="icon-linkedin"></span>
                 </a>
             &nbsp;
             {{end}}
             {{ if .Site.Params.githubName }}
                 <a class="bloglogo" href="https://github.com/{{ .Site.Params.githubName }}" target="_blank">
-                <span class="icon-github" style="color:white;font-size:2em"></span>
+                    <span class="icon-github"></span>
                 </a>
             &nbsp;
             {{end}}
+            {{ if .Site.Params.flickrName }}
+                <a class="bloglogo" href="https://flickr.com/{{ .Site.Params.flickrName }}" target="_blank">
+                <span class="icon-flickr" style="color:white;font-size:2em"></span>
+                </a>
+            &nbsp;
+            {{end}}            
             {{ if .Site.Params.twitterName }}
                 <a class="bloglogo" href="https://twitter.com/{{ .Site.Params.twitterName }}" target="_blank">
-                    <span class="icon-twitter" style="color:white;font-size:2em"></span>
+                    <span class="icon-twitter"></span>
                 </a>
             &nbsp;
             {{end}}
             {{ if .Site.Params.facebookName }}
                 <a class="bloglogo" href="https://www.facebook.com/{{ .Site.Params.facebookName }}" target="_blank">
-                    <span class="icon-facebook" style="color:white;font-size:2em"></span>
+                    <span class="icon-facebook"></span>
                 </a>
             &nbsp;
             {{end}}
             {{ if .Site.Params.instagramName }}
                 <a class="bloglogo" href="https://instagram.com/{{ .Site.Params.instagramName }}" target="_blank">
-                    <span class="icon-instagram" style="color:white;font-size:2em"></span>
+                    <span class="icon-instagram"></span>
+                </a>
+            &nbsp;
+            {{end}}
+            {{ if .Site.Params.email }}
+                <a class="bloglogo" href="mailto:{{ .Site.Params.email }}" target="_blank">
+                    <span class="icon-mail" style="color:white;font-size:2em"></span>
                 </a>
             &nbsp;
             {{end}}
             {{ if .Site.Params.pinterestName }}
                 <a class="bloglogo" href="https://www.pinterest.com/{{ .Site.Params.pinterestName }}" target="_blank">
-                    <span class="icon-pinterest" style="color:white;font-size:2em"></span>
+                    <span class="icon-pinterest"></span>
                 </a>
             &nbsp;
             {{end}}
             {{ if .Site.Params.googlePlusName }}
                 <a class="bloglogo" href="https://google.com/+{{ .Site.Params.googlePlusName }}" target="_blank">
-                    <span class="icon-google-plus" style="color:white;font-size:2em"></span>
+                    <span class="icon-google-plus"></span>
                 </a>
             &nbsp;
             {{end}}
@@ -79,35 +91,7 @@ <h2 class="page-description">{{ .Site.Params.description }}</h2>
 
 <main id="content" class="content" role="main">
 
-    {{ range .Data.Pages }}
-        {{if eq .Type "index" }}
-        <div class="index-content post">
-        {{.Content}}
-        </div>
-        {{end}}
-    {{ end }}
-
-    {{ if not ($.Scratch.Get "paginatedSections") }}
-        {{ if isset .Site.Params "paginatedSections" }}
-            {{ $.Scratch.Set "paginatedSections" .Site.Params.paginatedSections }}
-        {{ else }}
-            {{ $.Scratch.Set "paginatedSections" "post" }}
-        {{ end }}
-    {{ end }}
-
-    {{ $list := where .Data.Pages "Section" "in" ($.Scratch.Get "paginatedSections") }}
-    {{ $list := where $list "Section" "!=" "" }}
-    {{ $paginator := .Paginate ( $list ) }}
-
-    <div class="extra-pagination inner">
-        {{ partial "pagination.html" $paginator }}
-    </div>
-
-    {{ range $index, $page := $paginator.Pages }}
-        {{ partial "li.html" . }}
-    {{ end }}
-
-    {{ partial "pagination.html" $paginator }}
+{{ partial "home-content.html" . }}
 
 </main>
 

diff --git a/layouts/page/cover.html b/layouts/page/cover.html
@@ -6,7 +6,7 @@
   {{if or (eq (substr .Params.image 0 7) "http://") (eq (substr .Params.image 0 8) "https://")}}
   <header class="main-header post-head" style="background-image: url({{.Params.image}})">
   {{ else }}
-  <header class="main-header post-head" style="background-image: url({{ $baseurl }}{{.Params.image}})">
+  <header class="main-header post-head" style="background-image: url({{.Params.image | relURL}})">
   {{ end }}
   <nav class="main-nav overlay clearfix">
 {{else}}
@@ -15,7 +15,7 @@
 {{end}}
 
       {{ if .Site.Params.logo }}
-        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Home" /></a>
+        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{ .Site.Params.logo | relURL }}" alt="Home" /></a>
       {{end}}
       {{ if .Site.Menus.main }}
           <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
@@ -114,7 +114,7 @@ <h2 class="page-description">
 
     {{if .Site.Params.logo}}
     <figure class="author-image">
-        <a class="img" href="{{.Site.BaseURL}}" style="background-image: url({{ $baseurl }}{{.Site.Params.logo}})"><span class="hidden">{{.Site.Params.author}}'s Picture</span></a>
+        <a class="img" href="{{.Site.BaseURL}}" style="background-image: url({{.Site.Params.logo | relURL}})"><span class="hidden">{{.Site.Params.author}}'s Picture</span></a>
     </figure>
     {{end}}
 

diff --git a/layouts/page/list.html b/layouts/page/list.html
@@ -5,20 +5,20 @@
   {{if or (eq (substr .Params.cover 0 7) "http://") (eq (substr .Params.cover 0 8) "https://")}}
 	<header class="main-header tag-head" style="background-image: url({{.Params.cover}})">
   {{ else }}
-  <header class="main-header tag-head" style="background-image: url({{ $baseurl }}{{.Params.cover}})">
+  <header class="main-header tag-head" style="background-image: url({{.Params.cover | relURL}})">
   {{ end }}
 {{else if .Site.Params.cover}}
 	{{if or (eq (substr .Site.Params.cover 0 7) "http://") (eq (substr .Site.Params.cover 0 8) "https://")}}
   <header class="main-header tag-head" style="background-image: url({{.Site.Params.cover}})">
   {{ else }}
-  <header class="main-header tag-head" style="background-image: url({{ $baseurl }}{{.Site.Params.cover}})">
+  <header class="main-header tag-head" style="background-image: url({{.Site.Params.cover | relURL}})">
   {{ end }}
 {{else}}
 	<header class="main-header tag-head no-cover">
 {{end}}
     <nav class="main-nav overlay clearfix">
       {{ if .Site.Params.logo }}
-        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Home" /></a>
+        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{ .Site.Params.logo | relURL }}" alt="Home" /></a>
       {{end}}
       {{ if .Site.Menus.main }}
           <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>

diff --git a/layouts/page/single.html b/layouts/page/single.html
@@ -6,7 +6,7 @@
   {{if or (eq (substr .Params.image 0 7) "http://") (eq (substr .Params.image 0 8) "https://")}}
   <header class="main-header post-head" style="background-image: url({{.Params.image}})">
   {{ else }}
-  <header class="main-header post-head" style="background-image: url({{ $baseurl }}{{.Params.image}})">
+  <header class="main-header post-head" style="background-image: url({{.Params.image | relURL}})">
   {{ end }}
   <nav class="main-nav overlay clearfix">
 {{else}}
@@ -15,7 +15,7 @@
 {{end}}
 
       {{ if .Site.Params.logo }}
-        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{.Site.BaseURL}}{{ .Site.Params.logo }}" alt="Home" /></a>
+        <a class="blog-logo" href="{{.Site.BaseURL}}"><img src="{{ .Site.Params.logo | relURL }}" alt="Home" /></a>
       {{end}}
       {{ if .Site.Menus.main }}
           <a class="menu-button" href="#"><span class="burger">&#9776;</span><span class="word">Menu</span></a>
@@ -156,7 +156,7 @@ <h1 class="post-title">{{.Title}}</h1>
 
     {{if .Site.Params.logo}}
     <figure class="author-image">
-        <a class="img" href="{{.Site.BaseURL}}" style="background-image: url({{ $baseurl }}{{.Site.Params.logo}})"><span class="hidden">{{.Site.Params.author}}'s Picture</span></a>
+        <a class="img" href="{{.Site.BaseURL}}" style="background-image: url({{.Site.Params.logo | relURL}})"><span class="hidden">{{.Site.Params.author}}'s Picture</span></a>
     </figure>
     {{end}}
 

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -5,9 +5,9 @@
         {{end}}
     </footer>
     </div>
-    <script type="text/javascript" src="{{.Site.BaseURL}}js/jquery.js"></script>
-    <script type="text/javascript" src="{{.Site.BaseURL}}js/jquery.fitvids.js"></script>
-    <script type="text/javascript" src="{{.Site.BaseURL}}js/index.js"></script>
+    <script type="text/javascript" src="{{"js/jquery.js" | relURL}}"></script>
+    <script type="text/javascript" src="{{"js/jquery.fitvids.js" | relURL}}"></script>
+    <script type="text/javascript" src="{{"js/index.js" | relURL}}"></script>
     {{ if .Site.Params.customFooterPartial }}
         {{ partial .Site.Params.customFooterPartial . }}
     {{ end }}

diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -7,25 +7,32 @@
 
     {{ partial "twitter_card.html" . }}
 
-  	<meta property="og:title" content="{{ if ne .URL "/" }} {{ .Title }} &middot; {{ end }} {{ .Site.Title }}" />
+  	<meta property="og:title" content="{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
   	<meta property="og:site_name" content="{{ .Site.Title }}" />
   	<meta property="og:url" content="{{ .Permalink }}" />
 
+    {{if .Params.image }}
+       <meta property="og:image" content="{{ .Params.image | relURL}}"/>
+    {{else}}
+        {{if .Site.Params.cover}}
+            <meta property="og:image" content="{{ .Site.Params.cover | relURL}}"/>
+        {{end}}
+    {{end}}
+
     {{ if .IsPage }}
+    <meta property="og:description" content="{{ .Description }}" />
   	<meta property="og:type" content="article" />
-
-    <meta property="og:article:published_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}" />
+    <meta property="article:published_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}" />
 
     {{ range .Params.tags }}
-    <meta property="og:article:tag" content="{{ . }}" />
+    <meta property="article:tag" content="{{ . }}" />
     {{ end }}
     {{ else }}
     <meta property="og:type" content="website" />
+    <meta property="og:description" content="{{ .Site.Params.description }}" />
     {{ end }}
 
-    <title>
-      {{ if ne .URL "/" }} {{ .Title }} &middot; {{ end }} {{ .Site.Title }}
-    </title>
+    <title>{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}</title>
 
     {{ if .IsPage }}
     <meta name="description" content="{{ .Description | default (substr .Summary 0 160) }}" />
@@ -36,19 +43,22 @@
     <meta name="HandheldFriendly" content="True" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <link rel="shortcut icon" href="{{.Site.BaseURL}}images/favicon.ico">
-	  <link rel="apple-touch-icon" href="{{.Site.BaseURL}}images/apple-touch-icon.png" />
+    <link rel="shortcut icon" href="{{ "images/favicon.ico" | relURL}}">
+	  <link rel="apple-touch-icon" href="{{ "images/apple-touch-icon.png" | relURL}}" />
 
-    <link rel="stylesheet" type="text/css" href="{{.Site.BaseURL}}css/screen.css" />
-    <link rel="stylesheet" type="text/css" href="{{.Site.BaseURL}}css/nav.css" />
-    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Merriweather:300,700,700italic,300italic|Open+Sans:700,400|Inconsolata" />
+    <link rel="stylesheet" type="text/css" href="{{ "css/screen.css" | relURL}}" />
+    <link rel="stylesheet" type="text/css" href="{{ "css/nav.css" | relURL}}" />
 
 
+    {{ range .Site.Params.customCSS }}
+    <link rel="stylesheet" href="{{ . | relURL }}">
+    {{ end }}
+
     {{ if .Site.Params.RSSLink}}
         <link href="{{.Site.Params.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
     {{else}}
       {{ if ne .URL "/" }}
-          <link href="{{ .Site.BaseURL }}index.xml" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+          <link href="{{ "index.xml" | relURL}}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
       {{ end }}
       {{if .IsNode}}
         <link href="{{.RSSLink}}" rel="alternate" type="application/rss+xml" title="{{ if ne .URL "/" }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
@@ -58,6 +68,12 @@
 
     <link rel="canonical" href="{{ .Permalink }}" />
 
+    {{ if .Params.customSemanticPartial }}
+      {{ partial .Params.customSemanticPartial . }}
+    {{ else }}
+      {{ partial "semantic.html" . }}
+    {{end}}
+
     {{with  .Site.Params.googleAnalyticsUserID }}
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){