From 94687f78e934c0768e63da0f1036dfc04f614440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Thu, 9 Jan 2025 11:12:55 +0100
Subject: [PATCH] Website: prevent newline after shortcodes

---
 .../flamenco/downloadExperimentalLink.html    |  1 +
 .../shortcodes/flamenco/downloadLink.html     |  1 +
 .../flamenco/latestExperimentalVersion.html   |  2 +-
 .../shortcodes/flamenco/latestVersion.html    |  2 +-
 .../shortcodes/flamenco/reportBugLink.html    |  2 ++
 .../shortcodes/flamenco/sha256link.html       |  1 +
 .../flamenco/sha256linkExperimental.html      |  1 +
 .../shortcodes/flamenco/toc-children.html     | 22 +++++++++----------
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/web/project-website/layouts/shortcodes/flamenco/downloadExperimentalLink.html b/web/project-website/layouts/shortcodes/flamenco/downloadExperimentalLink.html
index 8ee3d1a6..557760cd 100644
--- a/web/project-website/layouts/shortcodes/flamenco/downloadExperimentalLink.html
+++ b/web/project-website/layouts/shortcodes/flamenco/downloadExperimentalLink.html
@@ -3,3 +3,4 @@
 {{- $extension := .Get "ext" | default "tar.gz" -}}
 {{- $filename := printf "flamenco-%s-%s-%s.%s" $.Site.Data.flamenco.latestExperimentalVersion $os $arch $extension -}}
 <a class="flamenco-download-link" href="/downloads/{{ $filename }}">{{ $filename }}</a>
+{{- "" -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/downloadLink.html b/web/project-website/layouts/shortcodes/flamenco/downloadLink.html
index 46988cfe..a5fbd939 100644
--- a/web/project-website/layouts/shortcodes/flamenco/downloadLink.html
+++ b/web/project-website/layouts/shortcodes/flamenco/downloadLink.html
@@ -4,3 +4,4 @@
 {{- $version := .Get "version" | default $.Site.Data.flamenco.latestVersion -}}
 {{- $filename := printf "flamenco-%s-%s-%s.%s" $version $os $arch $extension -}}
 <a class="flamenco-download-link" href="/downloads/{{ $filename }}">{{ $filename }}</a>
+{{- "" -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/latestExperimentalVersion.html b/web/project-website/layouts/shortcodes/flamenco/latestExperimentalVersion.html
index 50a5a300..6b5b40ad 100644
--- a/web/project-website/layouts/shortcodes/flamenco/latestExperimentalVersion.html
+++ b/web/project-website/layouts/shortcodes/flamenco/latestExperimentalVersion.html
@@ -1 +1 @@
-{{ $.Site.Data.flamenco.latestExperimentalVersion }}
+{{- $.Site.Data.flamenco.latestExperimentalVersion -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/latestVersion.html b/web/project-website/layouts/shortcodes/flamenco/latestVersion.html
index b00c8718..ba1948ad 100644
--- a/web/project-website/layouts/shortcodes/flamenco/latestVersion.html
+++ b/web/project-website/layouts/shortcodes/flamenco/latestVersion.html
@@ -1 +1 @@
-{{ $.Site.Data.flamenco.latestVersion }}
+{{- $.Site.Data.flamenco.latestVersion -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/reportBugLink.html b/web/project-website/layouts/shortcodes/flamenco/reportBugLink.html
index 7df0c083..fb80f4ff 100644
--- a/web/project-website/layouts/shortcodes/flamenco/reportBugLink.html
+++ b/web/project-website/layouts/shortcodes/flamenco/reportBugLink.html
@@ -9,3 +9,5 @@
 <a class="{{ with $class }}{{ printf " %s" . }}{{ end }}"
   {{- with $ref }}{{ printf " href=\"%s\"" . | safeHTMLAttr }}{{ end }}
 >{{ $.Inner }}</a>
+
+{{- "" -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/sha256link.html b/web/project-website/layouts/shortcodes/flamenco/sha256link.html
index 71fb7b12..46ebd7f2 100644
--- a/web/project-website/layouts/shortcodes/flamenco/sha256link.html
+++ b/web/project-website/layouts/shortcodes/flamenco/sha256link.html
@@ -1,2 +1,3 @@
 {{- $filename := printf "flamenco-%s.sha256" $.Site.Data.flamenco.latestVersion -}}
 <a class="flamenco-download-link" href="/downloads/{{ $filename }}">{{ $filename }}</a>
+{{- "" -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/sha256linkExperimental.html b/web/project-website/layouts/shortcodes/flamenco/sha256linkExperimental.html
index b51f1f12..e0fca0e0 100644
--- a/web/project-website/layouts/shortcodes/flamenco/sha256linkExperimental.html
+++ b/web/project-website/layouts/shortcodes/flamenco/sha256linkExperimental.html
@@ -1,2 +1,3 @@
 {{- $filename := printf "flamenco-%s.sha256" $.Site.Data.flamenco.latestExperimentalVersion -}}
 <a class="flamenco-download-link" href="/downloads/{{ $filename }}">{{ $filename }}</a>
+{{- "" -}}
diff --git a/web/project-website/layouts/shortcodes/flamenco/toc-children.html b/web/project-website/layouts/shortcodes/flamenco/toc-children.html
index 8a49f506..fec4b76e 100644
--- a/web/project-website/layouts/shortcodes/flamenco/toc-children.html
+++ b/web/project-website/layouts/shortcodes/flamenco/toc-children.html
@@ -7,14 +7,14 @@
 <!-- This TOC Excludes the current section index and the current page -->
 
 <div>
-    {{ $current_page_title := .Page.Title }}
-    <ul>
-        {{ range .Page.CurrentSection.Data.Pages.ByWeight }}
-            {{ if ne .Page.Title $current_page_title }}
-            <li>
-                <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-            </li>
-            {{ end }}
-        {{ end  }}
-    </ul>
-</div>
\ No newline at end of file
+  {{ $current_page_title := .Page.Title }}
+  <ul>
+    {{ range .Page.CurrentSection.Data.Pages.ByWeight }}
+    {{ if ne .Page.Title $current_page_title }}
+    <li>
+      <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+    </li>
+    {{ end }}
+    {{ end }}
+  </ul>
+</div>