WIP:layout

diff --git a/content/about/impressum/_index.html b/content/about/impressum/_index.html
index f34642e03c0d6a363047b13ef61a8fdf9c6b1566..a250c536122f24839005db4d17bc06fc69dc71a5 100644 (file)
--- a/content/about/impressum/_index.html
+++ b/content/about/impressum/_index.html
@@ -5,8 +5,6 @@ outputs:
   - html
 weight: 10
 ---
-<article class="maincontent">
-      <header><h1>Impressum</h1></header>
       <p><em>Angaben gemäß § 5 TMG:</em></p>
       <p>
         Kai Moritz<br>
@@ -24,7 +22,6 @@ weight: 10
         More contact-information (Facebook, Google+, ...) can be found on the
         <a href="contact.html" th:href="@{/contact.html}" title="Show all contact-informations">contact-page</a>.
       </p>
-    </article>
 <aside class="marginalcontent" th:replace="/templates/fragments.html :: about"></aside>
 <ul id="links">
       <li class="f" id="copyright">© <strong>mo</strong> 2013</li>

diff --git a/layouts/baseof.html b/layouts/baseof.html
index 5e2c57776b787363afe5b35c7d8605c389611365..0bb66c6e365c9a56cedd879a4428fedf67c08dcc 100644 (file)
--- a/layouts/baseof.html
+++ b/layouts/baseof.html
@@ -8,8 +8,8 @@
     {{- partial "header.html" . }}
     {{- partial "breadcrumb.html" . }}
     <main class="content cf">
-        <article id="content" class="main" th:include="${maincontent}">
-          <header><h1>{{ site.Title }}</h1></header>
+        <article id="content" class="main">
+          <header><h1>{{ .Title }}</h1></header>
           {{- block "main" . }}{{ end }}
         </article>
         <div class="marginal">

diff --git a/layouts/page.html b/layouts/page.html
index 7e286c80218e935af6181f62bdcc83f5fd9b197f..30fcf482e54166f3973ff7b446a2b20141e83e0e 100644 (file)
--- a/layouts/page.html
+++ b/layouts/page.html
@@ -1,6 +1,4 @@
 {{ define "main" }}
-  <h1>{{ .Title }}</h1>
-
   {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
   {{ $dateHuman := .Date | time.Format ":date_long" }}
   <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>