From 6d70469a7241c2b144dc11b416172ce5e3130745 Mon Sep 17 00:00:00 2001 From: Raoul Date: Mon, 30 Apr 2018 04:01:47 +0200 Subject: [PATCH] More template cleanup --- .../cosin-theme/layouts/_default/baseof.html | 24 ++++++++----------- .../cosin-theme/layouts/_default/single.html | 6 +---- themes/cosin-theme/layouts/index.html | 6 +---- .../layouts/partials/fahrplan.de.html | 2 +- .../layouts/partials/fahrplan.en.html | 2 +- .../layouts/partials/fahrplan.fr.html | 2 +- .../layouts/partials/fahrplan.it.html | 2 +- 7 files changed, 16 insertions(+), 28 deletions(-) diff --git a/themes/cosin-theme/layouts/_default/baseof.html b/themes/cosin-theme/layouts/_default/baseof.html index 9dff456..5cae779 100644 --- a/themes/cosin-theme/layouts/_default/baseof.html +++ b/themes/cosin-theme/layouts/_default/baseof.html @@ -1,7 +1,7 @@ - + - {{ block "title" . }}{{ .Site.Title }}{{ with .Title }} | {{ . }}{{ end }}{{ end }} + {{ .Site.Title }} | {{ .Page.Title }} {{ .Hugo.Generator }} @@ -10,27 +10,23 @@ - {{ block "header" . }} {{ partial "site-header.html" . }} {{ end }} {{ block "menu" . }} {{ partial "site-menu.html" . }} {{ end }}
- {{ block "sidebar" . }} - {{ if eq .Site.Language.Lang "de" }} - {{ partial "site-sidebar.de.html" . }} - {{ else if eq .Site.Language.Lang "fr" }} - {{ partial "site-sidebar.fr.html" . }} - {{ else if eq .Site.Language.Lang "it" }} - {{ partial "site-sidebar.it.html" . }} - {{ else if eq .Site.Language.Lang "en" }} - {{ partial "site-sidebar.en.html" . }} - {{ end }} + {{ if eq .Site.Language.Lang "de" }} + {{ partial "site-sidebar.de.html" . }} + {{ else if eq .Site.Language.Lang "fr" }} + {{ partial "site-sidebar.fr.html" . }} + {{ else if eq .Site.Language.Lang "it" }} + {{ partial "site-sidebar.it.html" . }} + {{ else if eq .Site.Language.Lang "en" }} + {{ partial "site-sidebar.en.html" . }} {{ end }} {{ block "main" . }} {{ end }}
{{ block "footer" . }} {{ partial "site-footer.html" . }} {{ end }} - diff --git a/themes/cosin-theme/layouts/_default/single.html b/themes/cosin-theme/layouts/_default/single.html index c7e9399..3f3cb21 100644 --- a/themes/cosin-theme/layouts/_default/single.html +++ b/themes/cosin-theme/layouts/_default/single.html @@ -1,11 +1,7 @@ {{ define "main" }}
-
-
-
- {{ .Content }} -
+ {{ .Content }}
{{ end }} diff --git a/themes/cosin-theme/layouts/index.html b/themes/cosin-theme/layouts/index.html index c7e9399..3f3cb21 100644 --- a/themes/cosin-theme/layouts/index.html +++ b/themes/cosin-theme/layouts/index.html @@ -1,11 +1,7 @@ {{ define "main" }}
-
-
-
- {{ .Content }} -
+ {{ .Content }}
{{ end }} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.de.html b/themes/cosin-theme/layouts/partials/fahrplan.de.html index f33cc50..104f818 100644 --- a/themes/cosin-theme/layouts/partials/fahrplan.de.html +++ b/themes/cosin-theme/layouts/partials/fahrplan.de.html @@ -9,4 +9,4 @@

Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.

-{{ end}} +{{ end }} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.en.html b/themes/cosin-theme/layouts/partials/fahrplan.en.html index c7f902d..7e2728a 100644 --- a/themes/cosin-theme/layouts/partials/fahrplan.en.html +++ b/themes/cosin-theme/layouts/partials/fahrplan.en.html @@ -9,4 +9,4 @@

Schedule of this year's CoSin will be online in early June.

-{{ end}} +{{ end }} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.fr.html b/themes/cosin-theme/layouts/partials/fahrplan.fr.html index f33cc50..104f818 100644 --- a/themes/cosin-theme/layouts/partials/fahrplan.fr.html +++ b/themes/cosin-theme/layouts/partials/fahrplan.fr.html @@ -9,4 +9,4 @@

Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.

-{{ end}} +{{ end }} diff --git a/themes/cosin-theme/layouts/partials/fahrplan.it.html b/themes/cosin-theme/layouts/partials/fahrplan.it.html index f33cc50..104f818 100644 --- a/themes/cosin-theme/layouts/partials/fahrplan.it.html +++ b/themes/cosin-theme/layouts/partials/fahrplan.it.html @@ -9,4 +9,4 @@

Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.

-{{ end}} +{{ end }}