More template cleanup

This commit is contained in:
Raoul 2018-04-30 04:01:47 +02:00
parent 8cc2ae00ee
commit 6d70469a72
No known key found for this signature in database
GPG key ID: C7493D73B67C1842
7 changed files with 16 additions and 28 deletions

View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang='{{ .Site.Language.Lang | default "de" }}'> <html lang='{{ .Site.Language.Lang }}'>
<head> <head>
<title>{{ block "title" . }}{{ .Site.Title }}{{ with .Title }} | {{ . }}{{ end }}{{ end }}</title> <title>{{ .Site.Title }} | {{ .Page.Title }}</title>
<meta charset="utf-8"> <meta charset="utf-8">
{{ .Hugo.Generator }} {{ .Hugo.Generator }}
@ -10,12 +10,10 @@
</head> </head>
<body> <body>
{{ block "header" . }} {{ partial "site-header.html" . }} {{ end }} {{ block "header" . }} {{ partial "site-header.html" . }} {{ end }}
{{ block "menu" . }} {{ partial "site-menu.html" . }} {{ end }} {{ block "menu" . }} {{ partial "site-menu.html" . }} {{ end }}
<div id="content"> <div id="content">
{{ block "sidebar" . }}
{{ if eq .Site.Language.Lang "de" }} {{ if eq .Site.Language.Lang "de" }}
{{ partial "site-sidebar.de.html" . }} {{ partial "site-sidebar.de.html" . }}
{{ else if eq .Site.Language.Lang "fr" }} {{ else if eq .Site.Language.Lang "fr" }}
@ -25,12 +23,10 @@
{{ else if eq .Site.Language.Lang "en" }} {{ else if eq .Site.Language.Lang "en" }}
{{ partial "site-sidebar.en.html" . }} {{ partial "site-sidebar.en.html" . }}
{{ end }} {{ end }}
{{ end }}
{{ block "main" . }} {{ end }} {{ block "main" . }} {{ end }}
<div style="clear: both;"></div> <div style="clear: both;"></div>
</div> </div>
{{ block "footer" . }} {{ partial "site-footer.html" . }} {{ end }} {{ block "footer" . }} {{ partial "site-footer.html" . }} {{ end }}
</body> </body>
</html> </html>

View file

@ -1,11 +1,7 @@
{{ define "main" }} {{ define "main" }}
<div class="right"> <div class="right">
<article> <article>
<header>
</header>
<div>
{{ .Content }} {{ .Content }}
</div>
</article> </article>
</div> </div>
{{ end }} {{ end }}

View file

@ -1,11 +1,7 @@
{{ define "main" }} {{ define "main" }}
<div class="right"> <div class="right">
<article> <article>
<header>
</header>
<div>
{{ .Content }} {{ .Content }}
</div>
</article> </article>
</div> </div>
{{ end }} {{ end }}