themes/beautifulhugo/i18n/nl.yaml

+# Content
+- id: dateFormat
+  translation: "2006-01-02"
+- id: shortdateFormat
+  translation: "2 Jan, 2006 15:04:05"
+- id: postedOnDate
+  translation: "Gepost op {{ . }}"
+- id: lastModified
+  translation: "(Laatst gewijzigd op {{ . }})"
+- id: translationsLabel
+  translation: "Andere talen: "
+- id: translationsSeparator
+  translation: ", "
+- id: readMore
+  translation: "Meer lezen"
+- id: olderPosts
+  translation: "Oudere berichten"
+- id: newerPosts
+  translation: "Nieuwere berichten"
+- id: previousPost
+  translation: "Vorige bericht"
+- id: nextPost
+  translation: "Volgende bericht"
+- id: readTime
+  translation: "minuten"
+- id: words
+  translation: "woorden"
+
+
+# 404 page
+- id: pageNotFound
+  translation: "Oeps, deze pagina bestaat niet. (404 Error)"
+
+# Footer
+- id: poweredBy # Accepts HTML
+  translation: '<a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a>-aangedreven &nbsp;&bull;&nbsp; Thema door <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> aangepast van <a href="https://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a>'
+
+# Navigation
+- id: toggleNavigation
+  translation: "Navigatie"
+- id: languageSwitcherLabel
+  translation: "Taal"
+- id: gcseLabelShort
+  translation: "Zoeken"
+- id: gcseLabelLong
+  translation: "Zoek {{ .Site.Title }}"
+- id: gcseClose
+  translation: "Sluiten"
+
+# Staticman
+- id: noComment
+  translation: "Geen commentaar"
+- id: oneComment
+  translation: "reactie"
+- id: moreComment
+  translation: "reacties"
+- id: useMarkdown
+  translation: "Je kunt Markdown-syntax gebruiken"
+- id: yourName
+  translation: "Jouw naam"
+- id: yourEmail
+  translation: "Jouw e-mailadres"
+- id: yourWebsite
+  translation: "Jouw website"
+
+# Delayed Disqus
+- id: show
+  translation: "Laat zien"
+- id: comments
+  translation: "reacties"
+
+# Related posts
+- id: seeAlso
+  translation: "Zie ook"

themes/beautifulhugo/i18n/pl.yaml

+# Content
+- id: dateFormat
+  translation: "02.01.2006"
+- id: shortdateFormat
+  translation: "2 Jan, 2006 15:04:05"
+- id: postedOnDate
+  translation: "Opublikowany {{ . }}"
+- id: lastModified
+  translation: "(Ostatnia modyfikacja {{ . }})"
+- id: translationsLabel
+  translation: "Inne języki: "
+- id: translationsSeparator
+  translation: ", "
+- id: readMore
+  translation: "Więcej"
+- id: olderPosts
+  translation: "Poprzednie wpisy"
+- id: newerPosts
+  translation: "Następne wpisy"
+- id: previousPost
+  translation: "Poprzedni"
+- id: nextPost
+  translation: "Następny"
+- id: readTime
+  translation: "minuty"
+- id: words
+  translation: "słowa"
+
+
+# 404 page
+- id: pageNotFound
+  translation: "Nieprawidłowy adres (błąd 404)"
+
+# Footer
+- id: poweredBy # Accepts HTML
+  translation: '<a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a> napędzany &nbsp;&bull;&nbsp; Motyw <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> przystosowany od <a href="https://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a>'
+
+# Navigation
+- id: toggleNavigation
+  translation: "Nawigacja"
+- id: languageSwitcherLabel
+  translation: "Język"
+- id: gcseLabelShort
+  translation: "Szukaj"
+- id: gcseLabelLong
+  translation: "Szukaj {{ .Site.Title }}"
+- id: gcseClose
+  translation: "Zamknij"
+
+# Staticman
+- id: noComment
+  translation: "Bez komentarza"
+- id: oneComment
+  translation: "komentarz"
+- id: moreComment
+  translation: "komentarzy"
+- id: useMarkdown
+  translation: "Możesz użyć składni Markdown"
+- id: yourName
+  translation: "Twoje imię"
+- id: yourEmail
+  translation: "Twój adres email"
+- id: yourWebsite
+  translation: "Twoja strona internetowa"
+
+# Delayed Disqus
+- id: show
+  translation: "Pokaż"
+- id: comments
+  translation: "komentarzy" 
+
+# Related posts
+- id: seeAlso
+  translation: "Zobacz też"

themes/beautifulhugo/i18n/ru.yaml

 # Content
 - id: dateFormat
-  translation: "Январь 2, 2006"
+  translation: "02.01.2006"
+- id: shortdateFormat
+  translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Опубликовано {{ .Count }}"
+  translation: "Опубликовано {{ . }}"
+- id: lastModified
+  translation: "(Последнее изменение {{ . }})"
 - id: translationsLabel
   translation: "Другие языки: "
 - id: translationsSeparator
@@ -17,6 +21,11 @@
   translation: "Предыдущий"
 - id: nextPost
   translation: "Следующий"
+- id: readTime
+  translation: "минут"
+- id: words
+  translation: "слова"
+
 
 # 404 page
 - id: pageNotFound
@@ -24,7 +33,7 @@
 
 # Footer
 - id: poweredBy # Accepts HTML
-  translation: 'На базе <a href="http://gohugo.io">Hugo v{{ .Hugo.Version }}</a> &nbsp;&bull;&nbsp; Тема <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> на базе <a href="http://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a>'
+  translation: 'На базе <a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a> &nbsp;&bull;&nbsp; Тема <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> на базе <a href="https://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a>'
 
 # Navigation
 - id: toggleNavigation
@@ -38,3 +47,28 @@
 - id: gcseClose
   translation: "Закрыть"
 
+# Staticman
+- id: noComment
+  translation: "Без комментариев"
+- id: oneComment
+  translation: "комментарий"
+- id: moreComment
+  translation: "комментарии"
+- id: useMarkdown
+  translation: "Вы можете использовать синтаксис Markdown"
+- id: yourName
+  translation: "Ваше имя"
+- id: yourEmail
+  translation: "Ваш адрес электронной почты"
+- id: yourWebsite
+  translation: "Ваш сайт"
+
+# Delayed Disqus
+- id: show
+  translation: "Показать"
+- id: comments
+  translation: "комментариев" 
+
+# Related posts
+- id: seeAlso
+  translation: "Смотрите также"

themes/beautifulhugo/i18n/tr.yaml

+# Content
+- id: dateFormat
+  translation: "2 Ocak 2006"
+- id: shortdateFormat
+  translation: "2 Oca 2006 15.04.05"
+- id: postedOnDate
+  translation: "{{ .Count }} tarihinde paylaşıldı"
+- id: lastModified
+  translation: "({{ .Count }} tarihinde güncellendi)"
+- id: translationsLabel
+  translation: "Diğer diller: "
+- id: translationsSeparator
+  translation: ", "
+- id: readMore
+  translation: "Daha fazla oku"
+- id: olderPosts
+  translation: "Önceki gönderiler"
+- id: newerPosts
+  translation: "Son gönderiler"
+- id: previousPost
+  translation: "Önceki gönderi"
+- id: nextPost
+  translation: "Sonraki gönderi"
+- id: readTime
+  translation: "dakika"
+- id: words
+  translation: "kelime"
+
+
+# 404 page
+- id: pageNotFound
+  translation: "Ups, bu sayfa mevcut değil. Başka bir yöne ilerleyin. (404 hatası)"
+
+# Footer
+- id: poweredBy # Accepts HTML
+  translation: '<a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a> altyapısı &nbsp;&bull;&nbsp; <a href="https://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a> temasından uyarlanan <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> teması kullanılmaktadır.'
+
+# Navigation
+- id: toggleNavigation
+  translation: "Gezinmeyi aktifleştirin"
+- id: languageSwitcherLabel
+  translation: "Dil"
+- id: gcseLabelShort
+  translation: "Arama"
+- id: gcseLabelLong
+  translation: "{{ .Site.Title }} içinde arayın"
+- id: gcseClose
+  translation: "Kapat"
+
+# Staticman
+- id: noComment
+  translation: "Yorum yok"
+- id: oneComment
+  translation: "yorum"
+- id: moreComment
+  translation: "yorum"
+- id: useMarkdown
+  translation: "Markdown söz dizimini kullanabilirsiniz"
+- id: yourName
+  translation: "İsminiz"
+- id: yourEmail
+  translation: "E-posta adresiniz"
+- id: yourWebsite
+  translation: "Web siteniz"
+
+# Delayed Disqus
+- id: show
+  translation: "Göster"
+- id: comments
+  translation: "yorumlar" 
+
+# Related posts
+- id: seeAlso
+  translation: "Ayrıca bakınız"

themes/beautifulhugo/i18n/zh-CN.yaml

+# Content
+- id: dateFormat
+  translation: "January 2, 2006"
+- id: shortdateFormat
+  translation: "2 Jan, 2006 15:04:05"
+- id: postedOnDate
+  translation: "发表于 {{ . }}"
+- id: lastModified
+  translation: "(上次修改时间 {{ . }})"
+- id: translationsLabel
+  translation: "其它语言: "
+- id: translationsSeparator
+  translation: ", "
+- id: readMore
+  translation: "阅读全文"
+- id: olderPosts
+  translation: "下一页"
+- id: newerPosts
+  translation: "上一页"
+- id: previousPost
+  translation: "前一篇"
+- id: nextPost
+  translation: "后一篇"
+- id: readTime
+  translation: "分钟"
+- id: words
+  translation: "个字"
+
+
+# 404 page
+- id: pageNotFound
+  translation: "啊哦，这篇文章不存在。 (404 错误)"
+
+# Footer
+- id: poweredBy # Accepts HTML
+  translation: '由 <a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a> 强力驱动 &nbsp;&bull;&nbsp; 主题 <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> 移植自 <a href="https://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a>'
+
+# Navigation
+- id: toggleNavigation
+  translation: "切换导航"
+- id: languageSwitcherLabel
+  translation: "语言"
+- id: gcseLabelShort
+  translation: "搜索"
+- id: gcseLabelLong
+  translation: "搜索 {{ .Site.Title }}"
+- id: gcseClose
+  translation: "关闭"
+
+# Staticman
+- id: noComment
+  translation: "没有评论"
+- id: oneComment
+  translation: "则评论"
+- id: moreComment
+  translation: "则评论"
+- id: useMarkdown
+  translation: "您可以使用Markdown语法"
+- id: yourName
+  translation: "你的名字"
+- id: yourEmail
+  translation: "您的电子邮件地址"
+- id: yourWebsite
+  translation: "你的网页"
+
+# Delayed Disqus
+- id: show
+  translation: "显示"
+- id: comments
+  translation: "则评论"
+
+# Related posts
+- id: seeAlso
+  translation: "也可以看看"

themes/beautifulhugo/i18n/zh-TW.yaml

+# Content
+- id: dateFormat
+  translation: "January 2, 2006"
+- id: shortdateFormat
+  translation: "2 Jan, 2006 15:04:05"
+- id: postedOnDate
+  translation: "發表於 {{ . }}"
+- id: lastModified
+  translation: "(最後修改於 {{ . }})"
+- id: translationsLabel
+  translation: "其他語言: "
+- id: translationsSeparator
+  translation: ", "
+- id: readMore
+  translation: "閱讀全文"
+- id: olderPosts
+  translation: "更舊的文章"
+- id: newerPosts
+  translation: "更新的文章"
+- id: previousPost
+  translation: "上一篇"
+- id: nextPost
+  translation: "下一篇"
+- id: readTime
+  translation: "分鐘"
+- id: words
+  translation: "個字"
+
+
+# 404 page
+- id: pageNotFound
+  translation: "哎呀呀，這個頁面不存在，去其他地方逛逛吧。 (404 錯誤)"
+
+# Footer
+- id: poweredBy # Accepts HTML
+  translation: '由 <a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a> 提供 &nbsp;&bull;&nbsp; 主題 <a href="https://github.com/halogenica/beautifulhugo">Beautiful Hugo</a> 移植自 <a href="https://deanattali.com/beautiful-jekyll/">Beautiful Jekyll</a>'
+
+# Navigation
+- id: toggleNavigation
+  translation: "開關導覽"
+- id: languageSwitcherLabel
+  translation: "語言"
+- id: gcseLabelShort
+  translation: "搜尋"
+- id: gcseLabelLong
+  translation: "搜尋 {{ .Site.Title }}"
+- id: gcseClose
+  translation: "關閉"
+
+# Staticman
+- id: noComment
+  translation: "沒有評論"
+- id: oneComment
+  translation: "則評論"
+- id: moreComment
+  translation: "則評論"
+- id: useMarkdown
+  translation: "您可以使用Markdown語法"
+- id: yourName
+  translation: "您的名字"
+- id: yourEmail
+  translation: "您的電子信箱"
+- id: yourWebsite
+  translation: "您的網頁"
+
+# Delayed Disqus
+- id: show
+  translation: "顯示"
+- id: comments
+  translation: "則評論"
+
+# Related posts
+- id: seeAlso
+  translation: "其他相關"

themes/beautifulhugo/layouts/404.html

@@ -2,10 +2,17 @@
 {{ define "main" }}
   <div role="main" class="container main-content">
     <div class="text-center">
-      <h1>{{ i18n "pageNotFound" }}</h1>
-      <br/>
-      <img src="{{ .Site.BaseURL }}/img/404-southpark.jpg" />
+      <h1 class="error-emoji"></h1>
+      <p class="error-text">{{ i18n "pageNotFound" }}</p>
     </div>
   </div>
-{{ end }}
-
+<script>
+  var errorEmojiContainer = document.getElementsByClassName('error-emoji')[0];
+  var emojiArray = [
+    '\\(o_o)/', '(o^^)o', '(˚Δ˚)b', '(^-^*)', '(≥o≤)', '(^_^)b', '(·_·)',
+    '(=\'X\'=)', '(>_<)', '(;-;)', '\\(^Д^)/',
+  ];
+  var errorEmoji = emojiArray[Math.floor(Math.random() * emojiArray.length)];
+  errorEmojiContainer.appendChild(document.createTextNode(errorEmoji));
+</script>
+{{ end }}
\ No newline at end of file

themes/beautifulhugo/layouts/_default/baseof.html

 <!DOCTYPE html>
-<html lang="{{ .Lang }}">
-  {{ partial "head.html" . }}
+<html lang="{{ .Lang }}" itemscope itemtype="http://schema.org/WebPage">
+  <head>
+    {{ partial "head.html" . }}
+  </head>
   <body>
     {{ partial "nav.html" . }}
     {{ block "header" . }}{{ partial "header.html" . }}{{ end }}
     {{ block "main" . }}{{ end }}
     {{ partial "footer.html" . }}
+    {{ block "footer" . }}{{ end }}
   </body>
 </html>
 

themes/beautifulhugo/layouts/_default/list.html

-{{ define "header" }}
-  <header class="header-section ">
-    <div class="intro-header no-img">
-      <div class="container">
-        <div class="row">
-          <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-            <div class="page-heading">
-              <h1>{{ if .Data.Singular }}#{{ end }}{{ .Title }}</h1>
-              <hr class="small">
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </header>
-{{ end }}
 {{ define "main" }}
   <div class="container" role="main">
     <div class="row">
@@ -25,50 +9,19 @@
         {{ end }}
         <div class="posts-list">
           {{ range .Paginator.Pages }}
-            <article class="post-preview">
-              <a href="{{ .Permalink }}">
-                <h2 class="post-title">{{ .Title }}</h2>
-    
-                {{ if .Params.subtitle }}
-                  <h3 class="post-subtitle">
-                    {{ .Params.subtitle }}
-                  </h3>
-                {{ end }}
-              </a>
-    
-              <p class="post-meta">
-                {{ default (i18n "dateFormat") .Site.Params.dateformat | .Date.Format | i18n "postedOnDate" }}
-              </p>
-              <div class="post-entry">
-                {{ if .Truncated }}
-                  {{ .Summary }}
-                  <a href="{{ .Permalink }}" class="post-read-more">[{{ i18n "readMore" }}]</a>
-                {{ else }}
-                  {{ .Content }}
-                {{ end }}
-              </div>
-    
-              {{ if .Params.tags }}
-                <span class="post-meta">
-                  {{ range .Params.tags }}
-                    #<a href="{{ $.Site.LanguagePrefix }}/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
-                  {{ end }}
-                </span>
-              {{ end }}
-    
-            </article>
+            {{ partial "post_preview.html" .}}
           {{ end }}
         </div>
         {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }}
           <ul class="pager main-pager">
             {{ if .Paginator.HasPrev }}
               <li class="previous">
-                <a href="{{ .URL }}page/{{ .Paginator.Prev.PageNumber }}">&larr; {{ i18n "newerPosts" }}</a>
+                <a href="{{ .Permalink }}page/{{ .Paginator.Prev.PageNumber }}/">&larr; {{ i18n "newerPosts" }}</a>
               </li>
             {{ end }}
             {{ if .Paginator.HasNext }}
               <li class="next">
-                <a href="{{ .URL }}page/{{ .Paginator.Next.PageNumber }}">{{ i18n "olderPosts" }} &rarr;</a>
+                <a href="{{ .Permalink }}page/{{ .Paginator.Next.PageNumber }}/">{{ i18n "olderPosts" }} &rarr;</a>
               </li>
             {{ end }}
           </ul>
@@ -77,4 +30,3 @@
     </div>
   </div>
 {{ end }}
-

themes/beautifulhugo/layouts/_default/single.html

 {{ define "main" }}
-<div class="container">
+<div class="container" role="main">
   <div class="row">
     <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
       <article role="main" class="blog-post">
         {{ .Content }}
-      </article>
 
-      <ul class="pager blog-pager">
-        {{ if .PrevInSection }}
-          <li class="previous">
-            <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; {{ i18n "previousPost" }}</a>
-          </li>
+        {{ if .Params.tags }}
+          <div class="blog-tags">
+            {{ range .Params.tags }}
+              <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
+            {{ end }}
+          </div>
+        {{ end }}
+
+        {{ if $.Param "socialShare" }}
+            <hr/>
+            <section id="social-share">
+              <div class="list-inline footer-links">
+                {{ partial "share-links" . }}
+              </div>
+            </section>
         {{ end }}
-        {{ if .NextInSection }}
-          <li class="next">
-            <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">{{ i18n "nextPost" }} &rarr;</a>
-          </li>
+
+        {{ if .Site.Params.showRelatedPosts }}
+          {{ range first 1 (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
+            {{ $.Scratch.Set "has_related" true }}
+          {{ end }}
+
+          {{ if $.Scratch.Get "has_related" }}
+                  <h4 class="see-also">{{ i18n "seeAlso" }}</h4>
+                  <ul>
+                {{ $num_to_show := .Site.Params.related_content_limit | default 5 }}
+                {{ range first $num_to_show (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
+                    <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+                {{ end }}
+              </ul>
+
+          {{ end }}
         {{ end }}
-      </ul>
+      </article>
 
-      {{ if (.Params.comments) | or (and (or (not (isset .Params "comments")) (eq .Params.comments nil)) (.Site.Params.comments)) }}
+      {{ if ne .Type "page" }}
+        <ul class="pager blog-pager">
+          {{ if .PrevInSection }}
+            <li class="previous">
+              <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; {{ i18n "previousPost" }}</a>
+            </li>
+          {{ end }}
+          {{ if .NextInSection }}
+            <li class="next">
+              <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">{{ i18n "nextPost" }} &rarr;</a>
+            </li>
+          {{ end }}
+        </ul>
+      {{ end }}
+
+
+      {{ if (.Params.comments) | or (and (or (not (isset .Params "comments")) (eq .Params.comments nil)) (and .Site.Params.comments (ne .Type "page"))) }}
         {{ if .Site.DisqusShortname }}
+          {{ if .Site.Params.delayDisqus }}
+          <div class="disqus-comments">                  
+            <button id="show-comments" class="btn btn-default" type="button">{{ i18n "show" }} <span class="disqus-comment-count" data-disqus-url="{{ trim .Permalink "/" }}">{{ i18n "comments" }}</span></button>
+            <div id="disqus_thread"></div>
+
+            <script type="text/javascript">
+              var disqus_config = function () {
+              this.page.url = '{{ trim .Permalink "/" }}';
+            };
+
+          </script>
+          </div>
+          {{ else }}
           <div class="disqus-comments">
             {{ template "_internal/disqus.html" . }}
           </div>
+          {{ end }}
+        {{ end }}
+        {{ if .Site.Params.staticman }}
+          <div class="staticman-comments">
+            {{ partial "staticman-comments.html" . }}
+          </div>
         {{ end }}
       {{ end }}
 

themes/beautifulhugo/layouts/_default/terms.html

 {{ define "main" }}
-  {{ $data := .Data }}
-  <div class="container" role="main">
+
+{{ $data := .Data }}
+
+<div class="container" role="main">
+  <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> 
     <article class="post-preview">
-      <div class="list-group col-lg-4 col-lg-offset-4 col-md-6 col-md-offset-3">
-      {{ range $key, $value := .Data.Terms.ByCount }}
-      <a href="{{ $.Site.LanguagePrefix }}/{{ $data.Plural }}/{{ $value.Name | urlize }}" class="list-group-item">
-          {{ $value.Name }}<span class="badge">{{ $value.Count }}</span></a>
-      {{ end }}
+      <div class="panel-group" id="accordion">
+        {{ range $key, $value := .Data.Terms.ByCount }}
+          <div class="panel panel-default">
+            <a class="collapsed" role="button" data-toggle="collapse" data-target="#collapse{{ $value.Name }}" data-parent="#accordion">
+                <div class="panel-heading" id="header{{ $value.Name }}">
+                  <h4 class="panel-title">
+                      {{ $value.Name }}
+                    <span class="badge">{{ $value.Count }}</span>
+                  </h4>
+                </div>
+            </a>
+            <div id="collapse{{ $value.Name }}" class="panel-collapse collapse">
+              <div class="panel-body">
+                <a href="{{ $.Site.LanguagePrefix | absURL }}/{{ $data.Plural }}/{{ $value.Name | urlize }}/" class="list-group-item view-all">
+                View all</a>
+                <div class="list-group">
+                  {{ range $item := $value.WeightedPages }}
+                    <a href="{{$item.Permalink}}" class="list-group-item">{{ $item.Title }}</a>
+                  {{ end }}
+                </div>
+              </div>
+            </div>
+          </div>
+        {{ end }}
       </div>
     </article>
   </div>
-{{ end }}
+</div>
 
+
+{{ end }}

themes/beautifulhugo/layouts/index.html

@@ -9,36 +9,9 @@
         {{ end }}
 
         <div class="posts-list">
-          {{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
+          {{ $pag := .Paginate (where site.RegularPages "Type" "in" site.Params.mainSections).Reverse }}
           {{ range $pag.Pages }}
-            <article class="post-preview">
-              <a href="{{ .Permalink }}">
-                <h2 class="post-title">{{ .Title }}</h2>
-                {{ if .Params.subtitle }}
-                  <h3 class="post-subtitle">
-                  {{ .Params.subtitle }}
-                  </h3>
-                {{ end }}
-              </a>
-
-              {{ partial "post_meta.html" . }}
-              <div class="post-entry">
-                {{ if .Truncated }}
-                  {{ .Summary }}
-                  <a href="{{ .Permalink }}" class="post-read-more">[{{ i18n "readMore" }}]</a>
-                {{ else }}
-                  {{ .Content }}
-                {{ end }}
-              </div>
-
-              {{ if .Params.tags }}
-                <span class="post-meta">
-                {{ range .Params.tags }}
-                  #<a href="{{ $.Site.LanguagePrefix }}/tags/{{ . | urlize }}">{{ . }}</a>&nbsp;
-                {{ end }}
-                </span>
-              {{ end }}
-            </article>
+            {{ partial "post_preview" . }}
           {{ end }}
         </div>
 
@@ -46,12 +19,12 @@
           <ul class="pager main-pager">
             {{ if .Paginator.HasPrev }}
               <li class="previous">
-                <a href="{{ .URL }}page/{{ .Paginator.Prev.PageNumber }}">&larr; {{ i18n "newerPosts" }}</a>
+                <a href="{{ .Permalink }}page/{{ .Paginator.Prev.PageNumber }}/">&larr; {{ i18n "newerPosts" }}</a>
               </li>
             {{ end }}
             {{ if .Paginator.HasNext }}
               <li class="next">
-                <a href="{{ .URL }}page/{{ .Paginator.Next.PageNumber }}">{{ i18n "olderPosts" }} &rarr;</a>
+                <a href="{{ .Permalink }}page/{{ .Paginator.Next.PageNumber }}/">{{ i18n "olderPosts" }} &rarr;</a>
               </li>
             {{ end }}
           </ul>
@@ -60,4 +33,3 @@
     </div>
   </div>
 {{ end }}
-

themes/beautifulhugo/layouts/partials/footer.html

+  {{ if eq .Type "page" }}
+    {{ partial "page_meta.html" . }}
+  {{ end }}
 <footer>
   <div class="container">
     <div class="row">
@@ -8,7 +11,7 @@
               <li>
                 <a href="{{ printf .url (index $.Site.Author .id) }}" title="{{ .title }}">
                   <span class="fa-stack fa-lg">
-                    <i class="fa fa-circle fa-stack-2x"></i>
+                    <i class="fas fa-circle fa-stack-2x"></i>
                     <i class="{{ .icon }} fa-stack-1x fa-inverse"></i>
                   </span>
                 </a>
@@ -17,19 +20,30 @@
           {{ end }}
           {{ if .Site.Params.rss }}
           <li>
-            <a href="{{ "index.xml" | absLangURL }}" title="RSS">
+            <a href="{{ with .OutputFormats.Get "RSS" }}{{ .RelPermalink }}{{ end }}" title="RSS">
               <span class="fa-stack fa-lg">
-                <i class="fa fa-circle fa-stack-2x"></i>
-                <i class="fa fa-rss fa-stack-1x fa-inverse"></i>
+                <i class="fas fa-circle fa-stack-2x"></i>
+                <i class="fas fa-rss fa-stack-1x fa-inverse"></i>
               </span>
             </a>
           </li>
           {{ end }}
         </ul>
         <p class="credits copyright text-muted">
-          {{ .Site.Author.name }}
-          &nbsp;&bull;&nbsp;
-          {{ .Site.LastChange.Format "2006" }}
+          {{ if .Site.Author.name }}
+            {{ if .Site.Author.website }}
+              <a href="{{ .Site.Author.website }}">{{ .Site.Author.name }}</a>
+            {{ else }}
+              {{ .Site.Author.name }}
+            {{ end }}
+          {{ end }}
+
+          &nbsp;&bull;&nbsp;&copy;
+          {{ if .Site.Params.since }}
+            {{ .Site.Params.since }} - {{ .Site.LastChange.Format "2006" }}
+          {{ else }}
+            {{ .Site.LastChange.Format "2006" }}
+          {{ end }}
 
           {{ if .Site.Title }}
             &nbsp;&bull;&nbsp;
@@ -39,27 +53,45 @@
         <!-- Please don't remove this, keep my open source work credited :) -->
         <p class="credits theme-by text-muted">
           {{ i18n "poweredBy" . | safeHTML }}
-          {{ with .Site.Params.commit }}&nbsp;&bull;&nbsp;[<a href="{{.}}{{ getenv "GIT_COMMIT_SHA" }}">{{ getenv "GIT_COMMIT_SHA_SHORT" }}</a>]{{ end }}
+          {{ if $.GitInfo }}&nbsp;&bull;&nbsp;[<a href="{{ .Site.Params.commit }}{{ .GitInfo.Hash }}">{{ substr .GitInfo.Hash 0 8 }}</a>]{{ end }}
         </p>
       </div>
     </div>
   </div>
 </footer>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js" integrity="sha384-/y1Nn9+QQAipbNQWU65krzJralCnuOasHncUFXGkdwntGeSvQicrYkiUBwsgUqc1" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/contrib/auto-render.min.js" integrity="sha384-dq1/gEHSxPZQ7DdrM82ID4YVol9BYyU7GbWlIwnwyPzotpoc57wDw/guX8EaYGPx" crossorigin="anonymous"></script>
+{{- if .Site.Params.selfHosted -}}
+<script src="{{ "js/katex.min.js" | absURL }}"></script>
+<script src="{{ "js/auto-render.min.js" | absURL }}"></script>
+<script src="{{ "js/jquery.min.js" | absURL }}"></script>
+<script src="{{ "js/bootstrap.min.js" | absURL }}"></script>
+{{- else -}}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.js" integrity="sha384-K3vbOmF2BtaVai+Qk37uypf7VrgBubhQreNQe9aGsz9lB63dIFiQVlJbr92dw2Lx" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/contrib/auto-render.min.js" integrity="sha384-kmZOZB5ObwgQnS/DuDg6TScgOiWWBiVt0plIRkZCmE6rDZGrEOQeHM5PcHi+nyqe" crossorigin="anonymous"></script>
 <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+{{- end }}
+
 <script src="{{ "js/main.js" | absURL }}"></script>
+{{- if .Site.Params.staticman }}
+<script src="{{ "js/staticman.js" | absURL }}"></script>
+{{- end }}
+{{- if  .Site.Params.useHLJS }}
 <script src="{{ "js/highlight.min.js" | absURL }}"></script>
 <script> hljs.initHighlightingOnLoad(); </script>
+<script> $(document).ready(function() {$("pre.chroma").css("padding","0");}); </script>
+{{- end -}}
 <script> renderMathInElement(document.body); </script>
-<!-- Load PhotoSwipe js if the load-photoswipe shortcode has been used -->
-{{ if ($.Scratch.Get "photoswipeloaded") }}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/photoswipe.min.js" integrity="sha256-UplRCs9v4KXVJvVY+p+RSo5Q4ilAUXh7kpjyIP5odyc=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/photoswipe-ui-default.min.js" integrity="sha256-PWHOlUzc96pMc8ThwRIXPn8yH4NOLu42RQ0b9SpnpFk=" crossorigin="anonymous"></script>
-<script src="/js/load-photoswipe.js"></script>
-{{ end }}
+
+{{- if .Site.Params.selfHosted -}}
+<script src="{{ "js/photoswipe.min.js" | absURL }}"></script>
+<script src="{{ "js/photoswipe-ui-default.min.js" | absURL }}"></script>
+{{- else -}}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.2/photoswipe.min.js" integrity="sha384-QELNnmcmU8IR9ZAykt67vGr9/rZJdHbiWi64V88fCPaOohUlHCqUD/unNN0BXSqy" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.2/photoswipe-ui-default.min.js" integrity="sha384-m67o7SkQ1ALzKZIFh4CiTA8tmadaujiTa9Vu+nqPSwDOqHrDmxLezTdFln8077+q" crossorigin="anonymous"></script>
+{{- end -}}
+<script src="{{ "js/load-photoswipe.js" | absURL }}"></script>
+
 <!-- Google Custom Search Engine -->
 {{ if .Site.Params.gcse }}
 <script>
@@ -75,4 +107,51 @@
 </script>
 {{ end }}
 
+{{ if .Site.Params.piwik }}
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://{{ .Site.Params.piwik.server }}/";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "{{ .Site.Params.piwik.id }}"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript>
+<!-- Piwik Image Tracker -->
+<img src="http://{{ .Site.Params.piwik.server }}/piwik.php?idsite={{ .Site.Params.piwik.id }}&amp;rec=1" style="border:0" alt="" />
+<!-- End Piwik -->
+</noscript>
+<!-- End Piwik Code -->
+{{ end }}
+
+{{ if and .Site.Params.delayDisqus .Site.DisqusShortname }}
+<!-- Delayed Disqus -->
+<script type="text/javascript">
+$(function(){
+  $('#show-comments').on('click', function(){
+    var disqus_shortname = '{{ .Site.DisqusShortname }}';
+      
+    (function() {
+      var disqus = document.createElement('script'); 
+      disqus.type = 'text/javascript'; 
+      disqus.async = true;
+      disqus.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(disqus);
+    })();
+      
+    $(this).hide(); 
+    });
+  });
+      
+</script>
+<script id="dsq-count-scr" src="//{{ .Site.DisqusShortname }}.disqus.com/count.js" async></script>
+<!-- End Delayed Disqus -->
+{{ end }}
+
 {{- partial "footer_custom.html" . }}

themes/beautifulhugo/layouts/partials/footer_custom.html

 <!--
-If you want to include any custom html just before </body>, put it in /layouts/footer_custom.html
-Do not put anything in this file - it's only here so that hugo won't throw an error if /layouts/footer_custom.html doesn't exist.
--->
\ No newline at end of file
+If you want to include any custom html just before </body>, put it in /layouts/partials/footer_custom.html
+Do not put anything in this file - it's only here so that hugo won't throw an error if /layouts/partials/footer_custom.html doesn't exist.
+-->

themes/beautifulhugo/layouts/partials/head.html

-<head>
+{{- if eq .Kind "taxonomyTerm" }}
+  {{- range $key, $value := .Data.Terms.ByCount }}
+    {{- $.Scratch.Add "most_used" (slice $value.Name) }}
+  {{- end }}
+  {{- if not ($.Scratch.Get "most_used") }}
+    {{- $description := printf "A full overview of all pages with %s, ordered by %s" .Data.Plural .Data.Singular | truncate 180 }}
+    {{- $.Scratch.Set "Description" $description }}
+  {{- else }}
+    {{- $description := printf "A full overview of all pages with %s, ordered by %s, such as: %s" .Data.Plural .Data.Singular ( delimit ( $.Scratch.Get "most_used" ) ", " ", and " ) | truncate 180 }}
+    {{- $.Scratch.Set "Description" $description }}
+  {{- end }}
+
+  {{- $title := printf "Overview of all pages with %s, ordered by %s" .Data.Plural .Data.Singular }}
+  {{- $.Scratch.Set "Title" $title }}
+{{- else if eq .Kind "taxonomy" }}
+  {{- $description := printf "Overview of all pages with the %s #%s, such as: %s" .Data.Singular $.Title ( index .Pages 0).Title | truncate 160 }}
+  {{- $.Scratch.Set "Description" $description }}
+
+  {{- $title := printf "Overview of all pages with the %s #%s" .Data.Singular $.Title }}
+  {{- $.Scratch.Set "Title" $title }}
+{{- else }}
+  {{- $.Scratch.Set "Description" ( .Description | default .Params.subtitle | default .Summary ) }}
+  {{- $.Scratch.Set "Title" ( .Title | default .Site.Title ) }}
+{{- end }}
+
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 <!-- Site Title, Description, Author, and Favicon -->
-{{- with .Title | default .Site.Title }}
-  <title>{{ . }}</title>
-  <meta property="og:title" content="{{ . }}" />
-  <meta name="twitter:title" content="{{ . | truncate 70 }}" />
+{{- with ($.Scratch.Get "Title") }}
+  <title>{{ . }} - {{ $.Site.Title }}</title>
 {{- end }}
-{{- with .Description | default .Params.subtitle | default .Summary }}
+{{- with ($.Scratch.Get "Description") }}
   <meta name="description" content="{{ . }}">
-  <meta property="og:description" content="{{ . }}">
-  <meta name="twitter:description" content="{{ . | truncate 200 }}">
 {{- end }}
-  <meta name="author" content="{{ .Site.Author.name }}"/>
+{{- with .Site.Author.name }}
+  <meta name="author" content="{{ . }}"/>
+{{- end }}
+{{- partial "seo/main.html" . }}  
 {{- with .Site.Params.favicon }}
   <link href='{{ . | absURL }}' rel='icon' type='image/x-icon'/>
 {{- end -}}
-<!-- Social Media Tags -->
-{{- with .Params.share_img | default .Params.image | default .Site.Params.logo }}
-  <meta property="og:image" content="{{ . | absURL }}" />
-  <meta name="twitter:image" content="{{ . | absURL }}" />
-{{- end }}
-  <meta name="twitter:card" content="summary" />
-{{- with .Site.Author.twitter }}
-  <meta name="twitter:site" content="@{{ . }}" />
-  <meta name="twitter:creator" content="@{{ . }}" />
-{{- end }}
-{{- with .Site.Params.fb_app_id }}
-  <meta property="fb:app_id" content="{{ . }}" />
-{{- end }}
-  <meta property="og:url" content="{{ .URL | absLangURL }}" />
-  <meta property="og:type" content="website" />
-  <meta property="og:site_name" content="{{ .Site.Title }}" />
 <!-- Hugo Version number -->
-  {{ .Hugo.Generator -}}
+  {{ hugo.Generator -}}
 <!-- Links and stylesheets -->
-  <link rel="canonical" href="{{ .URL | absLangURL }}" />
   <link rel="alternate" href="{{ "index.xml" | absLangURL }}" type="application/rss+xml" title="{{ .Site.Title }}">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.css" integrity="sha384-wITovz90syo1dJWVh32uuETPVEtGigN07tkttEqPv+uR2SE/mbQcG7ATL28aI9H0" crossorigin="anonymous">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+
+  {{- if .Site.Params.selfHosted -}}
+  <link rel="stylesheet" href="{{ "css/katex.min.css" | absURL }}" />
+  <link rel="stylesheet" href="{{ "fontawesome/css/all.css" | absURL }}" />
+  <link rel="stylesheet" href="{{ "css/bootstrap.min.css" | absURL }}" />
+  {{- else -}}
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css" integrity="sha384-9eLZqc9ds8eNjO3TmqPeYcDj8n+Qfa4nuSiGYa6DjLNcv9BtN69ZIulL9+8CqC9Y" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+  {{- end -}}
+
   <link rel="stylesheet" href="{{ "css/main.css" | absURL }}" />
+
+  {{- if .Site.Params.staticman -}}
+  <link rel="stylesheet" href="{{ "css/staticman.css" | absURL }}" />
+  {{- end -}}
+
+  {{- if .Site.Params.selfHosted -}}
+  <link rel="stylesheet" href="{{ "css/fonts.css" | absURL }}" />
+  {{- else -}}
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" />
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800" />
-  <link rel="stylesheet" href="{{ "css/pygment_highlights.css" | absURL }}" />
+  {{- end -}}
+
+  {{- if .Site.Params.useHLJS }}
   <link rel="stylesheet" href="{{ "css/highlight.min.css" | absURL }}" />
+  {{- else -}}
+  <link rel="stylesheet" href="{{ "css/syntax.css" | absURL }}" />
+  {{- end -}}
+  <link rel="stylesheet" href="{{ "css/codeblock.css" | absURL }}" />
+  
+  {{- if .Site.Params.staticman.recaptcha -}}
+  <script src='https://www.google.com/recaptcha/api.js'></script>
+  {{- end -}}
+
+  {{- if .Site.Params.selfHosted -}}
+  <link rel="stylesheet" href="{{ "css/photoswipe.min.css" | absURL }}" />
+  <link rel="stylesheet" href="{{ "css/photoswipe.default-skin.min.css" | absURL }}" />
+  {{- else -}}
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.2/photoswipe.min.css" integrity="sha384-h/L2W9KefUClHWaty3SLE5F/qvc4djlyR4qY3NUV5HGQBBW7stbcfff1+I/vmsHh" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.2/default-skin/default-skin.min.css" integrity="sha384-iD0dNku6PYSIQLyfTOpB06F2KCZJAKLOThS5HRe8b3ibhdEQ6eKsFf/EeFxdOt5R" crossorigin="anonymous">
+  {{- end -}}
+
 {{- partial "head_custom.html" . }}
 {{ template "_internal/google_analytics_async.html" . }}
-</head>

themes/beautifulhugo/layouts/partials/head_custom.html

 <!--
-If you want to include any custom html just before </head>, put it in /layouts/head_custom.html
-Do not put anything in this file - it's only here so that hugo won't throw an error if /layouts/head_custom.html doesn't exist.
--->
\ No newline at end of file
+If you want to include any custom html just before </head>, put it in /layouts/partials/head_custom.html
+Do not put anything in this file - it's only here so that hugo won't throw an error if /layouts/partials/head_custom.html doesn't exist.
+-->

themes/beautifulhugo/layouts/partials/header.html

+{{- partial "load-photoswipe-theme.html" . }}
+
 {{ if .IsHome }}
-  {{ $.Scratch.Set "title" .Site.Title }}
+  {{ if .Site.Params.homeTitle }}{{ $.Scratch.Set "title" .Site.Params.homeTitle }}{{ else }}{{ $.Scratch.Set "title" .Site.Title }}{{ end }}
   {{ if .Site.Params.subtitle }}{{ $.Scratch.Set "subtitle" .Site.Params.subtitle }}{{ end }}
   {{ if .Site.Params.bigimg }}{{ $.Scratch.Set "bigimg" .Site.Params.bigimg }}{{ end }}
 {{ else }}
@@ -8,10 +10,20 @@
   {{ if .Params.bigimg }}{{ $.Scratch.Set "bigimg" .Params.bigimg }}{{ end }}
 {{ end }}
 {{ $bigimg := $.Scratch.Get "bigimg" }}
+{{ $title := $.Scratch.Get "title" }}
+{{ $subtitle := $.Scratch.Get "subtitle" }}
 
-{{ if or $bigimg ($.Scratch.Get "title") }}
+{{ if or $bigimg $title }}
   {{ if $bigimg }}
-    <div id="header-big-imgs" data-num-img={{len $bigimg}} {{range $i, $img := $bigimg}}data-img-src-{{add $i 1}}="{{$img.src | absURL }}" {{ if $img.desc}}data-img-desc-{{add $i 1}}="{{$img.desc}}"{{end}}{{end}}></div>
+    <div id="header-big-imgs" data-num-img={{len $bigimg}} 
+      {{range $i, $img := $bigimg}}
+         {{ if (fileExists $img.src)}} 
+          data-img-src-{{add $i 1}}="{{$img.src | absURL }}" 
+         {{else}}
+          data-img-src-{{add $i 1}}="{{$img.src}}" 
+         {{end}}
+         {{ if $img.desc}}data-img-desc-{{add $i 1}}="{{$img.desc}}"{{end}}
+      {{end}}></div>
   {{ end }}
 
   <header class="header-section {{ if $bigimg }}has-img{{ end }}">
@@ -42,23 +54,28 @@
       </div>
     {{end}}
     <div class="intro-header no-img">
-      {{ $subtitle := $.Scratch.Get "subtitle" }}
       <div class="container">
         <div class="row">
           <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
             <div class="{{ .Type }}-heading">
-              <h1>{{ with $.Scratch.Get "title" }}{{.}}{{ else }}<br/>{{ end }}</h1>
-                {{ if $subtitle }}
-                  {{ if eq .Type "page" }}
-                    <hr class="small">
-                    <span class="{{ .Type }}-subheading">{{ $subtitle }}</span>
-                  {{ else }}
-                    <h2 class="{{ .Type }}-subheading">{{ $subtitle }}</h2>
-                  {{ end }}
-                {{ end }}
-                {{ if eq .Type "post" }}
-                  {{ partial "post_meta.html" . }}
+              {{ if eq .Type "list" }}
+                <h1>{{ if .Data.Singular }}#{{ end }}{{ .Title }}</h1>
+              {{ else }}
+                <h1>{{ with $title }}{{.}}{{ else }}<br/>{{ end }}</h1>
+              {{ end }}
+              {{ if ne .Type "post" }}
+                <hr class="small">
+              {{ end }}
+              {{ if $subtitle }}
+                {{ if eq .Type "page" }}
+                  <span class="{{ .Type }}-subheading">{{ $subtitle }}</span>
+                {{ else }}
+                  <h2 class="{{ .Type }}-subheading">{{ $subtitle }}</h2>
                 {{ end }}
+              {{ end }}
+              {{ if eq .Type "post" }}
+                {{ partial "post_meta.html" . }}
+              {{ end }}
             </div>
           </div>
         </div>

themes/beautifulhugo/layouts/shortcodes/load-photoswipe.html → themes/beautifulhugo/layouts/partials/load-photoswipe-theme.html

 <!--
-Put this file in /layouts/shortcodes/load-photoswipe.html
 Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
 -->
 
-<!-- prevent this shortcode from being loaded more than once per page -->
-{{ if not ($.Page.Scratch.Get "photoswipeloaded") }}
-  {{ $.Page.Scratch.Set "photoswipeloaded" 1 }}
-
-<!--
-*** jQuery must be loaded before load-photoswipe.js ***
-- If your template already loads jQuery in the header then you don't need to load it again here.
-- If your template already loads jQuery in the footer, then you could load load-photoswipe.js from the footer instead
--->
-<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
-<script src="/js/load-photoswipe.js"></script>
-
-<!-- Photoswipe css/js libraries -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/photoswipe.min.css" integrity="sha256-sCl5PUOGMLfFYctzDW3MtRib0ctyUvI9Qsmq2wXOeBY=" crossorigin="anonymous" />
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/default-skin/default-skin.min.css" integrity="sha256-BFeI1V+Vh1Rk37wswuOYn5lsTcaU96hGaI7OUVCLjPc=" crossorigin="anonymous" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/photoswipe.min.js" integrity="sha256-UplRCs9v4KXVJvVY+p+RSo5Q4ilAUXh7kpjyIP5odyc=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/photoswipe/4.1.1/photoswipe-ui-default.min.js" integrity="sha256-PWHOlUzc96pMc8ThwRIXPn8yH4NOLu42RQ0b9SpnpFk=" crossorigin="anonymous"></script>
-
 <!-- Root element of PhotoSwipe. Must have class pswp. -->
 <div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
 <!-- Background of PhotoSwipe.
@@ -67,5 +48,4 @@ Documentation and licence at https://github.com/liwenyip/hugo-easy-gallery/
     </div>
     </div>
     </div>
-</div>
-{{ end }}
\ No newline at end of file
+</div>
\ No newline at end of file

themes/beautifulhugo/layouts/partials/nav.html

@@ -15,7 +15,7 @@
         {{ range .Site.Menus.main.ByWeight }}
           {{ if .HasChildren }}
             <li class="navlinks-container">
-              <a class="navlinks-parent" href="javascript:void(0)">{{ .Name }}</a>
+              <a class="navlinks-parent">{{ .Name }}</a>
               <div class="navlinks-children">
                 {{ range .Children }}
                   <a href="{{ .URL | relLangURL }}">{{ .Name }}</a>
@@ -32,7 +32,7 @@
         {{ if .Site.IsMultiLingual }}
           {{ if ge (len .Site.Languages) 3 }}
             <li class="navlinks-container">
-              <a class="navlinks-parent" href="javascript:void(0)">{{ i18n "languageSwitcherLabel" }}</a>
+              <a class="navlinks-parent">{{ i18n "languageSwitcherLabel" }}</a>
               <div class="navlinks-children">
                 {{ range .Site.Languages }}
                   {{ if not (eq .Lang $.Site.Language.Lang) }}
@@ -62,15 +62,15 @@
       </ul>
     </div>
 
-    <div class="avatar-container">
-      <div class="avatar-img-border">
-        {{ if isset .Site.Params "logo" }}
+    {{ if isset .Site.Params "logo" }}
+      <div class="avatar-container">
+        <div class="avatar-img-border">
           <a title="{{ .Site.Title }}" href="{{ "" | absLangURL }}">
             <img class="avatar-img" src="{{ .Site.Params.logo | absURL }}" alt="{{ .Site.Title }}" />
           </a>
-        {{ end }}
+        </div>
       </div>
-    </div>
+    {{ end }}
 
   </div>
 </nav>

themes/beautifulhugo/layouts/partials/page_meta.html

+<div class="page-meta">
+  {{ $lastmodstr := default (i18n "dateFormat") .Site.Params.dateformat | .Lastmod.Format }}
+  {{ $datestr := default (i18n "dateFormat") .Site.Params.dateformat | .Date.Format }}
+  {{ if ne $datestr $lastmodstr }}
+    {{ $lastmodstr | i18n "lastModified"  }}
+  {{ end }}
+</div>
+