{{ .Title }}
- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }}
- {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
- {{ partial "reading-time.html" . }}
- {{ end }}
+ {{ with .Params.description }}
{{ . | markdownify }}
{{ end }}
+
+ {{ partial "taxonomy_terms_article_wrapper.html" . }}
+ {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
+ {{ partial "reading-time.html" . }}
+ {{ end }}
+
{{ .Content }}
- {{ partial "related.html" . }}{{/* This line is the only addition to theme's file, moved from /docs */}}
+
+ {{ partial "related.html" . }}
{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
- {{ partial "feedback.html" .Site.Params.ui.feedback }}
-
+ {{ partial "feedback.html" .Site.Params.ui.feedback }}
+
{{ end }}
- {{ if (.Site.DisqusShortname) }}
-
- {{ partial "disqus-comment.html" . }}
+ {{ if (.Site.Params.DisqusShortname) }}
+
+ {{ partial "disqus-comment.html" . }}
{{ end }}
-
{{ partial "page-meta-lastmod.html" . }}
+ {{ partial "page-meta-lastmod.html" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index c9ce11a06..fdbc3d362 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,22 +1,27 @@
-{{/* Layout from docsy theme's /docs */}}
+
+
{{ define "main" }}
{{ .Title }}
- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }}
- {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
- {{ partial "reading-time.html" . }}
- {{ end }}
+ {{ with .Params.description }}
{{ . | markdownify }}
{{ end }}
+
+ {{ partial "taxonomy_terms_article_wrapper.html" . }}
+ {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }}
+ {{ partial "reading-time.html" . }}
+ {{ end }}
+
{{ .Content }}
- {{ partial "section-index.html" . }}
- {{ partial "related.html" . }}{{/* This line is the only addition to theme's file, moved from /docs */}}
+ {{ partial "section-index.html" . }}
+
+ {{ partial "related.html" . }}
{{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
- {{ partial "feedback.html" .Site.Params.ui.feedback }}
-
+ {{ partial "feedback.html" .Site.Params.ui.feedback }}
+
{{ end }}
{{ if (.Site.DisqusShortname) }}
-
- {{ partial "disqus-comment.html" . }}
+
+ {{ partial "disqus-comment.html" . }}
{{ end }}
-
{{ partial "page-meta-lastmod.html" . }}
+ {{ partial "page-meta-lastmod.html" . }}
{{ end }}
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
deleted file mode 100644
index 933fff78b..000000000
--- a/layouts/_default/search.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ define "main" }}
-
+ {{ T "post_last_mod" }} {{ .Lastmod.Format .Site.Params.time_format_default -}}
+ {{ with .GitInfo }}: {{/* Trim WS */ -}}
+
+ {{- .Subject }} ({{ .AbbreviatedHash }}) {{- /* Trim WS */ -}}
+
+ {{- end }}
+
{{ partial "page-meta-links" . }}
diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html
index 3fedd05fd..8ccb79637 100644
--- a/layouts/partials/page-meta-links.html
+++ b/layouts/partials/page-meta-links.html
@@ -1,26 +1,62 @@
-{{ if .Path }}
-{{ $pathFormatted := replace .Path "\\" "/" }}
-{{ $gh_repo := ($.Param "github_repo") }}
-{{ $gh_subdir := ($.Param "github_subdir") }}
-{{ $gh_project_repo := ($.Param "github_project_repo") }}
-{{ $gh_branch := (default "main" ($.Param "github_branch")) }}
-{{ if $gh_repo }}
+
+
+{{ if .File }}
+{{ $pathFormatted := replace .File.Path "\\" "/" -}}
+{{ $gh_repo := ($.Param "github_repo") -}}
+{{ $gh_url := ($.Param "github_url") -}}
+{{ $gh_subdir := ($.Param "github_subdir") -}}
+{{ $gh_project_repo := ($.Param "github_project_repo") -}}
+{{ $gh_branch := (default "main" ($.Param "github_branch")) -}}
-{{ $editURL := printf "%s/edit/%s/content/%s" $gh_repo $gh_branch $pathFormatted }}
-{{ if and ($gh_subdir) (.Site.Language.Lang) }}
-{{ $editURL = printf "%s/edit/%s/%s/content/%s/%s" $gh_repo $gh_branch $gh_subdir ($.Site.Language.Lang) $pathFormatted }}
-{{ else if .Site.Language.Lang }}
-{{ $editURL = printf "%s/edit/%s/content/%s/%s" $gh_repo $gh_branch ($.Site.Language.Lang) $pathFormatted }}
-{{ else if $gh_subdir }}
-{{ $editURL = printf "%s/edit/%s/%s/content/%s" $gh_repo $gh_branch $gh_subdir $pathFormatted }}
-{{ end }}
-{{ $issuesURL := printf "%s/issues/new?title=Improve+'%s'&labels=enhancement&body=Page:+%s\nVersion:+%s\n---" $gh_repo (htmlEscape $.Title) (htmlEscape $.RelPermalink) (htmlEscape $.Lastmod) }}{{/* Only line modified from theme. */}}
-
{{ T "post_edit_this" }}
-
{{ T "post_create_issue" }}
-{{ if $gh_project_repo }}
-{{ $project_issueURL := printf "%s/issues/new" $gh_project_repo }}
-
{{ T "post_create_project_issue" }}
-{{ end }}
+ {{ if $gh_url -}}
+ {{ warnf "Warning: use of `github_url` is deprecated. For details see https://www.docsy.dev/docs/adding-content/repository-links/#github_url-optional" -}}
+
{{ T "post_edit_this" }}
+ {{ else if $gh_repo -}}
+ {{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted -}}
+ {{ if and ($gh_subdir) (.Site.Language.Lang) -}}
+ {{ $gh_repo_path = printf "%s/%s/content/%s/%s" $gh_branch $gh_subdir ($.Site.Language.Lang) $pathFormatted -}}
+ {{ else if .Site.Language.Lang -}}
+ {{ $gh_repo_path = printf "%s/content/%s/%s" $gh_branch ($.Site.Language.Lang) $pathFormatted -}}
+ {{ else if $gh_subdir -}}
+ {{ $gh_repo_path = printf "%s/%s/content/%s" $gh_branch $gh_subdir $pathFormatted -}}
+ {{ end -}}
+
+ {{/* Adjust $gh_repo_path based on path_base_for_github_subdir */ -}}
+ {{ $ghs_base := $.Param "path_base_for_github_subdir" -}}
+ {{ $ghs_rename := "" -}}
+ {{ if reflect.IsMap $ghs_base -}}
+ {{ $ghs_rename = $ghs_base.to -}}
+ {{ $ghs_base = $ghs_base.from -}}
+ {{ end -}}
+ {{ with $ghs_base -}}
+ {{ $gh_repo_path = replaceRE . $ghs_rename $gh_repo_path -}}
+ {{ end -}}
+
+ {{ $viewURL := printf "%s/tree/%s" $gh_repo $gh_repo_path -}}
+ {{ $editURL := printf "%s/edit/%s" $gh_repo $gh_repo_path -}}
+
+ {{/*{{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (safeURL $.Title ) -}}*/}}
+ {{ $issuesURL := printf "%s/issues/new?title=Improve+'%s'&labels=enhancement&body=Page:+%s\nVersion:+%s\n---" $gh_repo (htmlEscape $.Title) (htmlEscape $.RelPermalink) (htmlEscape $.Lastmod) }}
+ {{ $newPageStub := resources.Get "stubs/new-page-template.md" -}}
+ {{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL -}}
+ {{ $newPageURL := printf "%s/new/%s?%s" $gh_repo $gh_repo_path $newPageQS -}}
+
+
+ {{/*
{{ T "post_view_this" }}*/}}
+
{{ T "post_edit_this" }}
+
+ {{/*
{{ T "post_create_child_page" }}*/}}
+
+ {{/*
{{ T "post_create_issue" }}*/}}
+
{{ T "post_create_issue" }}
+ {{ with $gh_project_repo -}}
+ {{ $project_issueURL := printf "%s/issues/new" . -}}
+
{{ T "post_create_project_issue" }}
+ {{ end -}}
+
+ {{ end -}}
+ {{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}}
+
{{ T "print_entire_section" }}
+ {{ end }}