From 0d33e23c4499658ea5b0fa8c1be71b69668b6858 Mon Sep 17 00:00:00 2001 From: Julien Schmidt <js@stusta.net> Date: Wed, 1 Nov 2017 18:29:51 +0100 Subject: [PATCH] use single template for index pages --- layouts/_default/single.html | 28 ++++++++++++++++++++-------- layouts/index.html | 22 ---------------------- 2 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 layouts/index.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index bc3a3e7..b8d9034 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,22 @@ {{ define "main" }} -<header> - <h1> - {{ .Title }} - </h1> -</header> -<div class=""> - {{ .Content }} -</div> + <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 }} diff --git a/layouts/index.html b/layouts/index.html deleted file mode 100644 index 2690276..0000000 --- a/layouts/index.html +++ /dev/null @@ -1,22 +0,0 @@ -{{ define "main" }} - <main aria-role="main"> - <header class="homepage-header"> - <h1>{{.Title}}</h1> - {{ with .Params.subtitle }} - <span class="subtitle">{{.}}</span> - {{ end }} - </header> - <div class="homepage-content"> - <!-- 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 }} -- GitLab