Kanonische Links über _canonical realisiert

[website] / dist / templates / layout.html
diff --git a/dist/templates/layout.html b/dist/templates/layout.html

index 791a43f..7175241 100644 (file)
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -5,20 +5,20 @@
      th:fragment="layout(uri,maincontent)"
      thymeproxy:variables="SET:sitemap.json"
      >
-  <head>
+  <head thymeproxy:variables="${json}">
      <meta charset="utf-8">
      <meta http-equiv="X-UA-Compatible" content="IE=edge">
      <meta name="viewport" content="width=device-width, initial-scale=1">
      <title th:replace="${title}">juplo - BASISTEMPLATE</title>
      <link rel="stylesheet" href="../css/juplo.css" th:href="@{/css/juplo.css}">
-    <link rel="caononical" href="layout.html" th:replace="${scripts_head}?:~{}">
+    <link rel="canonical" href="layout.html" th:href="${_canonical.get(uri)}?:${uri}">
+    <script th:replace="${scripts_head}?:~{}"></script>
    </head>
    <body
        th:fragment="body(uri, maincontent, marginalcontent)"
-      thymeproxy:variables="${json}"
        th:with="crumbs=${_crumbs.get(uri)}">
-    <div class="columns">
-      <main class="column content" th:include="${maincontent}" th:fragment="maincontent">
+    <div id="page" class="">
+      <main class="content section" th:include="${maincontent}" th:fragment="maincontent">
          <h1 th:text="${_titles.get(uri)}">TEMPLATE: Layout</h1>
          <p>
            <strong>Lorem ipsum</strong> dolor
@@ -63,7 +63,7 @@
            anim id est laborum.
          </p>
        </main>
-      <nav class="column is-3 has-text-right">
+      <nav class="section has-text-right">
          <a href="../index.html" th:href="@{/}" title="Home">
            <img src="/img/logo.svg" alt="juplo" class="logo">
          </a>
@@ -73,8 +73,8 @@
                submenu=${_childs.get(parent)},
                pos=1"
              id="navigation"
-            class="s mr-4"
-            th:class="'mr-4 s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')">
+            class="s mr-4 mt-4"
+            th:class="'mr-4 mt-4 s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')">
            <!--/*-->
            <li class="s sub off"><a href="../blog/" class="s">Blog</a></li>
            <!--*/-->
@@ -89,7 +89,7 @@
                    "
                class="s sub"
                th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')">
-            <a  href="../projekte.html"
+            <a  href="../projects.html"
                  th:if="${entry != parent}"
                  th:href="@{${entry}}"
                  class="s selected"
@@ -122,5 +122,15 @@
          </ul>
        </nav>
      </div>
+    <footer>
+      <div id="copyright" class="section">
+        <span>© <strong>mo</strong> 2021</span>
+      </div>
+      <div id="footerlinks" class="section has-text-right" th:include="~{::#links}?:_">
+        <a href="../impressum.html" th:href="@{/impressum.html}">Impressum</a>
+        <span class="spacer">|</span>
+        <a href="../datenschutz.html" th:href="@{/datenschutz.html}">Datenschutz</a>
+      </div>
+    </footer>
    </body>
  </html>