From ceee6df958a5049bd0a598f8fed3b08a6460c34c Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 9 Dec 2016 15:03:06 +0100 Subject: [PATCH 1/3] Properly named i18n files --- i18n/de.yaml | 29 ----------------------------- i18n/{en.yaml => en-US.yaml} | 0 i18n/{zh.yaml => zh-CN.yaml} | 0 3 files changed, 29 deletions(-) delete mode 100644 i18n/de.yaml rename i18n/{en.yaml => en-US.yaml} (100%) rename i18n/{zh.yaml => zh-CN.yaml} (100%) diff --git a/i18n/de.yaml b/i18n/de.yaml deleted file mode 100644 index 6472e51..0000000 --- a/i18n/de.yaml +++ /dev/null @@ -1,29 +0,0 @@ -- id: navbar_menu - translation: "Menü" - -- id: toplink_website - translation: "Website" - -- id: toplink_blog - translation: "Blog" - -- id: toplink_docs - translation: "Doku" - -- id: toplink_code - translation: "Quelltext" - -- id: toplink_downloads - translation: "Downloads" - -- id: toplink_github - translation: "GitHub" - -- id: read_more - translation: "Mehr..." - -- id: page_prev - translation: "Vorherige" - -- id: page_next - translation: "Nächste" diff --git a/i18n/en.yaml b/i18n/en-US.yaml similarity index 100% rename from i18n/en.yaml rename to i18n/en-US.yaml diff --git a/i18n/zh.yaml b/i18n/zh-CN.yaml similarity index 100% rename from i18n/zh.yaml rename to i18n/zh-CN.yaml From 422ed4aebc7dac0939783c0da959121b553f420a Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 9 Dec 2016 15:03:24 +0100 Subject: [PATCH 2/3] Dropped bad translated 404 file --- layouts/404.html | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 layouts/404.html diff --git a/layouts/404.html b/layouts/404.html deleted file mode 100644 index fdf9bc1..0000000 --- a/layouts/404.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ partial "header" . }} -{{ partial "navbar" . }} - -
-
-
-

Oops. We're sorry, but this page does not exist.

-
-
-
- -{{ partial "footer" . }} From 6172166474a1188967e53dd299c524e2500f37ff Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 9 Dec 2016 15:04:08 +0100 Subject: [PATCH 3/3] Cleanup of the theme files --- layouts/index.html | 7 ++---- layouts/partials/footer.html | 43 ++++++++++++---------------------- layouts/partials/header.html | 22 ++++++++++------- layouts/partials/navbar.html | 8 ++++--- layouts/partials/pages.html | 38 ++++++++++++++++++++++-------- layouts/partials/toc.html | 4 ++-- layouts/partials/toplinks.html | 12 +++++----- layouts/post/list.html | 6 ++++- layouts/post/single.html | 8 +++++-- src/main.scss | 6 +++-- 10 files changed, 86 insertions(+), 68 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index 015a11d..fa60ef7 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -3,11 +3,8 @@
-
- {{ partial "menu" . }} -
-
- {{ range where .Site.Pages "Type" "index" }} +
+ {{ range .Site.Pages }} {{ .Content }} {{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 17ec260..3f0600a 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,31 +1,18 @@ - + - - - - - + + + + + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index d6d7146..07c8483 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -6,19 +6,23 @@ {{ .Hugo.Generator }} - {{ with .Params.goimport }}{{ end }} - {{ with .Params.gosource }}{{ end }} + {{ if not .IsHome }}{{ .Title }} - {{ end }}{{ .Site.Title }} - - - - - + {{ with .Params.goimport }}{{ end }} + {{ with .Params.gosource }}{{ end }} {{ with .RSSLink }} - - + + {{ end }} + + + + + + + + diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 53f32a3..fc5f8fe 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -1,10 +1,12 @@