From 985eacea7ee286e227197515b37758a21177db0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Weber?= <mail@soeren-weber.de>
Date: Mon, 7 Mar 2022 17:22:20 +0100
Subject: [PATCH] theme: some restructuring

---
 layouts/partials/footer.html     |  6 ------
 layouts/partials/logo.html       |  2 +-
 layouts/partials/menu.html       |  7 -------
 layouts/partials/stylesheet.html | 16 ++++++++++++++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 5b2a77c0c3..a8d4568ce3 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -33,12 +33,6 @@
       }
     </script>
 {{- end }}
-    <script>
-      window.T_Copy_to_clipboard = '{{ T "Copy-to-clipboard" | safeJS }}';
-      window.T_Copied_to_clipboard = '{{ T "Copied-to-clipboard" | safeJS }}';
-      window.T_Copy_link_to_clipboard = '{{ T "Copy-link-to-clipboard" | safeJS }}';
-      window.T_Link_copied_to_clipboard = '{{ T "Link-copied-to-clipboard" | safeJS }}';
-    </script>
     <script src="{{"js/theme.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     {{- partial "custom-footer.html" . }}
   </body>
diff --git a/layouts/partials/logo.html b/layouts/partials/logo.html
index a7056828cf..080da0074e 100644
--- a/layouts/partials/logo.html
+++ b/layouts/partials/logo.html
@@ -39,7 +39,7 @@
               }
             }
             @media all and (-ms-high-contrast:none) {
-              /* IE11s understanding of positioning is weird at best */
+              {{ "/* IE11s understanding of positioning is weird at best */" | safeCSS }}
               a#logo {
                 margin-top: -58px;
               }
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index cfbc6cc9ee..7b98c57f59 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,11 +1,4 @@
 
-    {{ "<!-- hack to let hugo tell us how to get to the root when using relativeURLs, it needs to be called *url= for it to do its magic: -->" | safeHTML }}
-    {{ "<!-- https://github.com/gohugoio/hugo/blob/145b3fcce35fbac25c7033c91c1b7ae6d1179da8/transform/urlreplacers/absurlreplacer.go#L72 -->" | safeHTML }}
-    <script>
-      var index_url={{ "index.json" | relLangURL }};
-      var root_url="/";
-      var baseUri=root_url.replace(/\/$/, '');
-    </script>
     {{- $showvisitedlinks := .Site.Params.showVisitedLinks }}
     <aside id="sidebar" class="default-animation{{ if $showvisitedlinks }} showVisitedLinks{{ end }}">
       {{- $currentNode := . }}
diff --git a/layouts/partials/stylesheet.html b/layouts/partials/stylesheet.html
index 4b2e4c60e3..163114be8c 100644
--- a/layouts/partials/stylesheet.html
+++ b/layouts/partials/stylesheet.html
@@ -15,8 +15,8 @@
     {{- range .Site.Params.custom_css }}
     <link href="{{(printf "%s" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     {{- end }}
-    <style>
     {{- if .Site.Params.disableInlineCopyToClipBoard }}
+    <style>
       :not(pre) > code.copy-to-clipboard-code + span.copy-to-clipboard-button {
         display: none;
       }
@@ -25,10 +25,22 @@
         border-top-right-radius: 2px;
         border-right-width: 1px;
       }
-    {{- end }}
     </style>
+    {{- end }}
     <script src="{{"js/variant.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>
+      {{ "// hack to let hugo tell us how to get to the root when using relativeURLs, it needs to be called *url= for it to do its magic:" | safeJS }}
+      {{ "// https://github.com/gohugoio/hugo/blob/145b3fcce35fbac25c7033c91c1b7ae6d1179da8/transform/urlreplacers/absurlreplacer.go#L72" | safeJS }}
+      var index_url={{ "index.json" | relLangURL }};
+      var root_url="/";
+      var baseUri=root_url.replace(/\/$/, '');
+      {{ "// translations" | safeJS }}
+      window.T_Copy_to_clipboard = '{{ T "Copy-to-clipboard" | safeJS }}';
+      window.T_Copied_to_clipboard = '{{ T "Copied-to-clipboard" | safeJS }}';
+      window.T_Copy_link_to_clipboard = '{{ T "Copy-link-to-clipboard" | safeJS }}';
+      window.T_Link_copied_to_clipboard = '{{ T "Link-copied-to-clipboard" | safeJS }}';
+      {{ "// some further base stuff" | safeJS }}
+      var baseUriFull="{{ .Site.BaseURL | safeJS }}";
       {{- $quotedthemevariants := slice }}
       {{- range $themevariants }}
         {{- $quotedthemevariants = $quotedthemevariants | append (printf "\"%s\"" .) }}