Merge branch 'zzossig:master' into master

README.ko.md

@@ -268,10 +268,15 @@ showMobileMenuTerms = ["tags", "categories", "series"]
 # navbar
 enableThemeChange = true # site color theme
 
-# body
+# search
-enableBreadcrumb = true # breadcrumb for list, single page
 enableSearch = true # site search with fuse
 enableSearchHighlight = true # when true, search keyword will be highlighted
+searchContent = true # include content to search index
+searchDistance = 100 # fuse option: distance
+searchThreshold = 0.4 # 0.0: exact match, 1.0: any match
+
+# body
+enableBreadcrumb = true # breadcrumb for list, single page
 enableGoToTop = true # scroll to top
 enableWhoami = true # at the end of single page
 summaryShape = "classic" # card, classic, compact

assets/sass/pages/_single.scss

@@ -99,7 +99,7 @@
     margin: 1rem 0;
     font-size: 1rem;
     line-height: 1.7;
-    width: inheirt;
+    width: inherit;
     max-width: inherit;
     h1,
     h2,

exampleSite/config/_default/params.toml

@@ -30,15 +30,19 @@ hideHomeHeaderWhenMobile = false
 # menu
 showMobileMenuTerms = ["tags", "categories", "series"]
 
-# body
+# search
-enableBreadcrumb = true
-enablePhotoSwipe = true
 enableSearch = true
 enableSearchHighlight = true
+searchResultPosition = "main" # side, main
+searchContent = true # include content to search index
+searchDistance = 100 # fuse option
+searchThreshold = 0.4 # 0.0: exact match, 1.0: any match
+
+# body
+enableBreadcrumb = true
 enableGoToTop = true
 enableWhoami = true
 summaryShape = "classic" # card, classic, compact
-searchResultPosition = "main" # side, main
 archiveGroupByDate = "2006" # "2006-01": group by month, "2006": group by year
 archivePaginate = 13
 paginateWindow = 1

i18n/de.toml

@@ -0,0 +1,119 @@
+[search-placeholder]
+other = "Suchen ..."
+
+[summary-dateformat]
+other = "02.01.2006"
+
+[reading-time]
+other = "Min. Lesezeit"
+
+[tags]
+other = "Stichworte"
+
+[categories]
+other = "Kategorien"
+
+[series]
+other = "Serien"
+
+[archive-dateformat]
+other = "02.01."
+
+[talks-dateformat]
+other = "02.01."
+
+[single-dateformat]
+other = "02.01.2006"
+
+[pub-dateformat]
+other = "2006-01-02"
+
+[resume-dateformat]
+other = "Jan, 2006"
+
+[single-related]
+other = "Vgl. auch"
+
+[single-writtenBy]
+other = "ERSTELLT VON"
+
+[toc-label]
+other = "Inhaltsverzeichnis"
+
+[counter-site-pv]
+other = "Summe der Seitenaufrufe"
+
+[counter-site-uv]
+other = "Summe an Besuchern"
+
+[counter-page-pv]
+other = "Seitenaufrufe"
+
+[donate-message]
+other = "Unterstützen Sie den Autor über"
+
+[share-message]
+other = "Inhalt teilen auf:"
+
+[contact-name]
+other = "Name"
+
+[contact-email]
+other = "E-Mail"
+
+[contact-tel]
+other = "Tel"
+
+[contact-file]
+other = "Datei"
+
+[contact-message]
+other = "Nachricht"
+
+[contact-send]
+other = "Senden"
+
+[contact-browse]
+other = "Durchsuchen ..."
+
+[tooltip-home]
+other = "Start"
+
+[tooltip-written]
+other = "erstellt am:"
+
+[tooltip-modified]
+other = "geändert am:"
+
+[tooltip-reading-time]
+other = "Lesezeit"
+
+[showcase-overview]
+other = "Übersicht"
+
+[showcase-pinned]
+other = "gepinnt"
+
+[nojs-message]
+other = "Für eine optimale Darstellung aktivieren Sie bitte JavaScript."
+
+[posts-by-order]
+other = "TOP NACHRICHTEN"
+
+[skin-dark]
+other = "Dunkel"
+
+[skin-light]
+other = "Hell"
+
+[skin-hacker]
+other = "Schwarz/Grün"
+
+[skin-solarized]
+other = "Samtig Hell"
+
+[skin-kimbie]
+other = "Braun"
+
+[no-contents]
+other = "Hier gibt es nichts zu sehen!"

i18n/fr.toml

@@ -41,13 +41,13 @@ other = "RÉDIGÉ PAR"
 other = "Contenu"
 
 [counter-site-pv]
-other = "Total views"
+other = "Vues totales"
 
 [counter-site-uv]
 other = "visiteurs"
 
 [counter-page-pv]
-other = "views"
+other = "vues"
 
 [donate-message]
 other = "Soutenez l'auteur avec"
@@ -83,7 +83,7 @@ other = "Accueil"
 other = "Rédigé le"
 
 [tooltip-modified]
-other = "Modifié At"
+other = "Modifié le"
 
 [tooltip-reading-time]
 other = "Temps de lecture"
@@ -101,10 +101,10 @@ other = "Pour un rendu optimal, activez JavaScript"
 other = "MEILLEURES PUBLICATIONS"
 
 [skin-dark]
-other = "dark"
+other = "sombre"
 
 [skin-light]
-other = "light"
+other = "clair"
 
 [skin-hacker]
 other = "hacker"
@@ -119,4 +119,4 @@ other = "kimbie"
 other = "gruv"
 
 [no-contents]
-other = "Nothing to Display"
+other = "Rien à afficher"

i18n/uk.toml

@@ -0,0 +1,119 @@
+[search-placeholder]
+other = "Пошук"
+
+[summary-dateformat]
+other = "Jan 2, 2006"
+
+[reading-time]
+other = "хв читати"
+
+[tags]
+other = "Теги"
+
+[categories]
+other = "Категорії"
+
+[series]
+other = "Серії"
+
+[archive-dateformat]
+other = "Jan 2"
+
+[talks-dateformat]
+other = "Jan 2"
+
+[single-dateformat]
+other = "Jan 2, 2006"
+
+[pub-dateformat]
+other = "2006-01-02"
+
+[resume-dateformat]
+other = "Jan, 2006"
+
+[single-related]
+other = "Дивись також"
+
+[single-writtenBy]
+other = "НАПИСАВ"
+
+[toc-label]
+other = "Що на цій сторінці"
+
+[counter-site-pv]
+other = "Всього переглядів"
+
+[counter-site-uv]
+other = "Всього відвідувачів"
+
+[counter-page-pv]
+other = "переглядів"
+
+[donate-message]
+other = "Підтримайте автора"
+
+[share-message]
+other = "Поширити в"
+
+[contact-name]
+other = "Ім'я"
+
+[contact-email]
+other = "Email"
+
+[contact-tel]
+other = "Тел"
+
+[contact-file]
+other = "Файл"
+
+[contact-message]
+other = "Повідомлення"
+
+[contact-send]
+other = "Відправити"
+
+[contact-browse]
+other = "Огляд"
+
+[tooltip-home]
+other = "Дім"
+
+[tooltip-written]
+other = "Написано"
+
+[tooltip-modified]
+other = "Змінено"
+
+[tooltip-reading-time]
+other = "Час читання"
+
+[showcase-overview]
+other = "Огляд"
+
+[showcase-pinned]
+other = "Закріплено"
+
+[nojs-message]
+other = "Ця сторінка виглядає краще якщо JavaScript працює"
+
+[posts-by-order]
+other = "ТОП ПОСТИ"
+
+[skin-dark]
+other = "dark"
+
+[skin-light]
+other = "light"
+
+[skin-hacker]
+other = "hacker"
+
+[skin-solarized]
+other = "solarized"
+
+[skin-kimbie]
+other = "kimbie"
+
+[no-contents]
+other = "Нічого показувати"

layouts/_default/rss.xml

@@ -8,12 +8,12 @@
   <channel>
     <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
     <link>{{ .Permalink }}</link>
-    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
+    <description>{{ if .Site.Params.rssDescription }}{{ .Site.Params.rssDescription }}{{ else }}Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}{{ end }}</description>
     <generator>Hugo -- gohugo.io</generator>{{ with .Site.Language.Lang }}
     <language>{{.}}</language>{{end}}{{ with $.Site.Params.email }}
     <managingEditor>{{.}}{{ with $.Site.Params.myname }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Params.email }}
     <webMaster>{{.}}{{ with $.Site.Params.myname }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+    <copyright>{{ replace . "{year}" now.Year | markdownify}}</copyright>{{end}}{{ if not .Date.IsZero }}
     <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}{{ with .Site.Params.updatePeriod }}
     <sy:updatePeriod>{{.}}</sy:updatePeriod>{{end}}{{ with .Site.Params.updateFrequency }}
     <sy:updateFrequency>{{.}}</sy:updateFrequency>{{end}}

layouts/index.json

@@ -2,7 +2,11 @@
 {{- $.Scratch.Add "searchindex" slice -}}
 {{- range $index, $element := (where .Site.RegularPages "Kind" "page") -}}
   {{ with $element.Plain }}
-    {{- $.Scratch.Add "searchindex" (dict "id" $index "title" $element.Title "uri" $element.Permalink "tags" $element.Params.tags "section" $element.Section "content" $element.Plain "description" $element.Description) -}}
+    {{- if $.Param "searchContent" -}}
+      {{- $.Scratch.Add "searchindex" (dict "id" $index "title" $element.Title "uri" $element.Permalink "tags" $element.Params.tags "section" $element.Section "content" $element.Plain "description" $element.Description) -}}
+    {{ else }}
+      {{- $.Scratch.Add "searchindex" (dict "id" $index "title" $element.Title "uri" $element.Permalink "tags" $element.Params.tags "section" $element.Section "description" $element.Description) -}}
+    {{- end -}}
   {{ end }}
 {{- end -}}
 {{- $.Scratch.Get "searchindex" | jsonify -}}

layouts/partials/head/scripts.html

@@ -666,6 +666,12 @@
     
     {{ $enableSearch := ($.Param "enableSearch") }}
     var enableSearch = JSON.parse({{ $enableSearch | jsonify }});
+    {{ $searchDistance := ($.Param "searchDistance") }}
+    var searchDistance = JSON.parse({{ $searchDistance | jsonify }});
+    {{ $searchThreshold := ($.Param "searchThreshold") }}
+    var searchThreshold = JSON.parse({{ $searchThreshold | jsonify }});
+    {{ $searchContent := ($.Param "searchContent") }}
+    var searchContent = JSON.parse({{ $searchContent | jsonify }});
     {{ $enableSearchHighlight := ($.Param "enableSearchHighlight") }}
     var enableSearchHighlight = JSON.parse({{ $enableSearchHighlight | jsonify }});
     {{ $searchResultPosition := ($.Param "searchResultPosition") }}
@@ -690,12 +696,13 @@
         xhr.onload = function () {
           if (xhr.status === 200) {
             fuse = new Fuse(JSON.parse(xhr.response.toString('utf-8')), {
-              keys: sectionType.includes('publication') ? ['title', 'abstract'] : ['title', 'description', 'content'],
+              keys: sectionType.includes('publication') ? ['title', 'abstract'] : 
+                searchContent ? ['title', 'description', 'content'] : ['title', 'description'],
               includeMatches: enableSearchHighlight,
               shouldSort: true, // default: true
-              threshold: 0.4, // default: 0.6 (0.0 requires a perfect match)
+              threshold: searchThreshold ? searchThreshold : 0.4, // default: 0.6 (0.0 requires a perfect match)
               location: 0, // default: 0
-              distance: 100, // default: 100
+              distance: searchDistance ? searchDistance : 100, // default: 100
               maxPatternLength: 32,
               minMatchCharLength: 1,
               isCaseSensitive: false, // defualt: false
@@ -719,7 +726,7 @@
       var a = document.createElement('a');
       a.innerHTML = obj.item.title;
       a.setAttribute('class', 'search-result__item--title');
-      a.setAttribute('href', obj.item.permalink);
+      a.setAttribute('href', obj.item.uri);
 
       var descDiv = document.createElement('div');
       descDiv.setAttribute('class', 'search-result__item--desc');