WIP: title/main/marginal explizit

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

index 70ef030..1f946dc 100644 (file)
--- a/dist/templates/layout.html
+++ b/dist/templates/layout.html
@@ -2,11 +2,11 @@
  <html
      xmlns="http://www.w3.org/1999/xhtml"
      xmlns:th="http://www.thymeleaf.org"
-    th:fragment="layout(uri)"
+    th:fragment="layout(uri,maincontent,marginalcontent)"
      thymeproxy:variables="SET:sitemap.json"
      >
    <head>
-    <title th:replace="~{::#title}">juplo - BASISTEMPLATE</title>
+    <title th:replace="${title}">juplo - BASISTEMPLATE</title>
      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
      <meta name="viewport" content="width=device-width, initial-scale=1" />
      <!-- Default / Responsive -->
@@ -34,6 +34,7 @@
      <!--[if IE 8]>
        <link rel="stylesheet" th:rel="stylesheet" type="text/css" href="../css/ie8.css" th:href="@{/css/ie8.min.css}"/>
      <![endif]-->
+    <link rel="caononical" href="layout.html" th:replace="~{:: #canonical}?:~{}"/>
    </head>
    <body
        th:fragment="body(uri)"
@@ -65,7 +66,7 @@
          <hr class="b" />
        </div>
        <main class="content cf">
-        <article id="content" class="main" th:include="~{::.maincontent}">
+        <article id="content" class="main" th:include="${maincontent}">
            <header><h1 th:include="${title}">juplo - BASISTEMPLATE</h1></header>
            <div th:fragment="maincontent">
              <p>
@@ -156,6 +157,7 @@
                    th:class="'s' + (${childs} ? ' sub' : '') + (${selected or sibling or child} ? '' : ' off')"
                    >
                  <a  href="../potemkin/fix-swf/overview.html"
+                    th:if="${entry != parent}"
                      th:href="@{${entry}}"
                      class="s selected"
                      th:class="${selected} ? 's selected' : 's'"
@@ -187,7 +189,7 @@
              </ul>
              <hr class="n"/>
            </nav>
-          <aside class="m" th:insert="~{::.marginalcontent}?:~{}">
+          <aside class="m" th:insert="${marginalcontent}?:~{}">
            <!--/* the following  is only visible during natural templating -->
              <h1>Other nasty but marginal stuff</h1>
              <p>