Merge branch 'imfing:main' into main

pavel-francirek · Jan 27, 2024 · 73049cf · 73049cf
2 parents 339be90 + ff8f253
commit 73049cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/exampleSite/content/showcase/index.md b/exampleSite/content/showcase/index.md
@@ -16,4 +16,5 @@ Open source projects powered by Hextra.
  {{< card link="https://getporter.org/" title="Porter" image="https://repository-images.githubusercontent.com/155893691/aa249c80-fcf3-11ea-93b0-30079e8d7de4" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
  {{< card link="https://lutheranconfessions.org/" title="LutheranConfessions" image="https://github.com/imfing/hextra/assets/5097752/ad6625e4-88cd-4cad-b102-5399997d0359" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
  {{< card link="https://github.com/imfing/hextra-starter-template/" title="Hextra Starter Template" image="https://user-images.githubusercontent.com/5097752/263551418-c403b9a9-a76c-47a6-8466-513d772ef0b7.jpg" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
+ {{< card link="https://developers.clever-cloud.com/" title="Clever Cloud Documentation" image="https://cellar-c2.services.clever-cloud.com/documentation/doc-screenshot.png" imageStyle="object-fit:cover; aspect-ratio:16/9;" >}}
 {{< /cards >}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -16,6 +16,7 @@
  {{ end -}}
  </title>
  <meta name="description" content="{{ partial "utils/page-description.html" . }}" />
+ <link rel="canonical" href="{{ .Permalink }}">
 
  {{ partial "opengraph.html" . }}
  {{ template "_internal/schema.html" . -}}

diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html
@@ -26,8 +26,18 @@
  <div class="{{ $borderClass }} sticky bottom-0 flex flex-col items-start gap-2 pb-8 dark:border-neutral-800 contrast-more:border-t contrast-more:border-neutral-400 contrast-more:shadow-none contrast-more:dark:border-neutral-400">
  {{- if site.Params.editURL.enable -}}
  {{- $editURL := site.Params.editURL.base | default "" -}}
- {{- with .File -}}{{ $editURL = urls.JoinPath $editURL (replace .Path "\\" "/") }}{{- end -}}
- {{- with .Params.editURL -}}{{ $editURL = . }}{{- end -}}
+ {{- with .Params.editURL -}}
+ {{/* if `editURL` is set in the front matter */}}
+ {{- $editURL = . -}}
+ {{- else -}}
+ {{- with .File -}}
+ {{/* `.FileInfo.Meta.SourceRoot` is a Hugo internal field, e.g. `/path/to/repo/content/en/` */}}
+ {{- $sourceDir := replace (strings.TrimPrefix .FileInfo.Meta.BaseDir .FileInfo.Meta.SourceRoot) "\\" "/" -}}
+ {{- $sourceDir = strings.TrimPrefix "/content" $sourceDir -}}
+ {{- $path := replace .Path "\\" "/" -}}
+ {{- $editURL = urls.JoinPath $editURL $sourceDir $path -}}
+ {{- end -}}
+ {{- end -}}
  <a class="text-xs font-medium text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-gray-100 contrast-more:text-gray-800 contrast-more:dark:text-gray-50" href="{{ $editURL }}" target="_blank" rel="noreferer">{{ $editThisPage }}</a>
  {{- end -}}
  {{/* Scroll To Top */}}