diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 9baf19098623496a02bb0893c7a60c89db29f62a..4b159995af533c028bab69d883ea406e25950f92 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -13,10 +13,26 @@
<link rel="canonical" href="{{ .Permalink }}">
</head>
<body>
- <!-- Code that all your templates share, like a header -->
- {{ block "main" . }}
- <!-- The part of the page that begins to differ between templates -->
- {{ end }}
+
+ <main aria-role="main">
+ <header>
+ <h1>{{.Title}}</h1>
+ {{ with .Params.subtitle }}
+ <span class="subtitle">{{.}}</span>
+ {{ end }}
+ </header>
+ <div class="container">
+ {{ block "main" . }}{{.Content}}{{ end }}
+ </div>
+ </main>
+ <aside>
+ <h3>Next Office Hours</h3><!-- TODO: translate -->
+ <ul>
+ {{ range getJSON "https://sprechstunden.stusta.mhn.de/appointments.json"}}
+ <li>{{ dateFormat "Monday, Jan 2, 2006 15:04" (int .start) }}-{{ dateFormat "15:04" (int .end) }}</li>
+ {{ end }}
+ </ul>
+ </aside>
<footer>
<div class="container">
<a href="https://stustanet.de/impressum">Impressum</a>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b8d9034233c4ae2bfd65705d59322fd37acd5d66..65fd081908ce3f0ea3f110692e19ce3d2a1f2d71 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,22 +1 @@
-{{ define "main" }}
- <main aria-role="main">
- <header>
- <h1>{{.Title}}</h1>
- {{ with .Params.subtitle }}
- <span class="subtitle">{{.}}</span>
- {{ end }}
- </header>
- <div class="container">
- <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md -->
- {{.Content}}
- </div>
- <aside>
- <h3>Next Office Hours</h3><!-- TODO: translate -->
- <ul>
- {{ range getJSON "https://sprechstunden.stusta.mhn.de/appointments.json"}}
- <li>{{ dateFormat "Monday, Jan 2, 2006 15:04" (int .start) }}-{{ dateFormat "15:04" (int .end) }}</li>
- {{ end }}
- </ul>
- </aside>
- </main>
-{{ end }}
+{{ define "main" }}{{.Content}}{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index b8d9034233c4ae2bfd65705d59322fd37acd5d66..65fd081908ce3f0ea3f110692e19ce3d2a1f2d71 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,22 +1 @@
-{{ define "main" }}
- <main aria-role="main">
- <header>
- <h1>{{.Title}}</h1>
- {{ with .Params.subtitle }}
- <span class="subtitle">{{.}}</span>
- {{ end }}
- </header>
- <div class="container">
- <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md -->
- {{.Content}}
- </div>
- <aside>
- <h3>Next Office Hours</h3><!-- TODO: translate -->
- <ul>
- {{ range getJSON "https://sprechstunden.stusta.mhn.de/appointments.json"}}
- <li>{{ dateFormat "Monday, Jan 2, 2006 15:04" (int .start) }}-{{ dateFormat "15:04" (int .end) }}</li>
- {{ end }}
- </ul>
- </aside>
- </main>
-{{ end }}
+{{ define "main" }}{{.Content}}{{ end }}