From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 26 Mar 2022 15:17:07 +0000 (+0000)
Subject: Tera templates: Adjust syntax by moving imports to top
X-Git-Tag: otter-1.0.0~128
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4e99e6ffbe7cdc034f665cd6b63e878844b4279a;p=otter.git

Tera templates: Adjust syntax by moving imports to top

We are going to switch to a newer Tera which wants these at the top.
Empirically, we get a syntax error without this change.  The
requirementr doesn't seem to be documented, though.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/templates/landscape.tera b/templates/landscape.tera
index 16d8d762..eeaad5a4 100644
--- a/templates/landscape.tera
+++ b/templates/landscape.tera
@@ -1,8 +1,7 @@
-{# -*- HTML -*- -#}
+{% import "macros" as m %}{# -*- HTML -*- -#}
 <!-- Copyright 2020u Ian Jackson
      SPDX-License-Identifier: AGPL-3.0-or-later
      There is NO WARRANTY. -->
-{% import "macros" as m %}{# -*- HTML -*- -#}
 {{ m::header() }}
 <style>
   div[class=uos] {
diff --git a/templates/session.tera b/templates/session.tera
index 78e7e7d2..22c414f0 100644
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -1,8 +1,7 @@
-{# -*- HTML -*- -#}
+{% import "macros" as m %}{# -*- HTML -*- -#}
 <!-- Copyright 2020u Ian Jackson
      SPDX-License-Identifier: AGPL-3.0-or-later
      There is NO WARRANTY. -->
-{% import "macros" as m %}{# -*- HTML -*- -#}
 {{ m::header() }}
 <style>
   body {