From 9123ac559e0db5974b01209c3267b398cd972243 Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Sun, 26 Apr 2015 18:42:09 +0300 Subject: [PATCH] Fix multilingual site layouts/templates. --- examples/multilingual/config.toml | 4 ++-- examples/multilingual/content/about.en.md | 16 ++++++++-------- examples/multilingual/content/about.et.md | 16 ++++++++-------- examples/multilingual/content/index.en.md | 18 +++++++++--------- examples/multilingual/content/index.et.md | 18 +++++++++--------- examples/multilingual/content/story/alpha.md | 10 +++++----- examples/multilingual/content/story/beta.md | 10 +++++----- examples/multilingual/content/story/index.md | 18 +++++++++--------- examples/multilingual/content/uudis/alfa.md | 10 +++++----- examples/multilingual/content/uudis/beeta.md | 10 +++++----- examples/multilingual/content/uudis/index.md | 18 +++++++++--------- .../multilingual/layouts/_default/single.html | 2 +- .../multilingual/layouts/partials/footer.html | 2 +- .../multilingual/layouts/partials/header.html | 4 ++-- examples/multilingual/layouts/story/list.html | 15 --------------- examples/multilingual/layouts/uudis/list.html | 15 --------------- examples/multilingual/static/static/main.css | 2 +- 17 files changed, 79 insertions(+), 109 deletions(-) delete mode 100644 examples/multilingual/layouts/story/list.html delete mode 100644 examples/multilingual/layouts/uudis/list.html diff --git a/examples/multilingual/config.toml b/examples/multilingual/config.toml index 4285f302..9f436859 100644 --- a/examples/multilingual/config.toml +++ b/examples/multilingual/config.toml @@ -1,6 +1,6 @@ -baseurl = "" +baseurl = "http://example.com" [taxonomies] tag = "tags" group = "groups" -menu = "menu" +menu = "menu" \ No newline at end of file diff --git a/examples/multilingual/content/about.en.md b/examples/multilingual/content/about.en.md index a47d1d92..9a7b497c 100644 --- a/examples/multilingual/content/about.en.md +++ b/examples/multilingual/content/about.en.md @@ -1,12 +1,12 @@ ---- -title: "About" -linktitle: "About" -url: /about ++++ +title = "About" +linktitle = "About" +url = "/about" -lang: "en" -menu: ["en"] -menu_weight: 30 ---- +lang = "en" +menu = ["en"] +menu_weight = 30 ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum ex deleniti ut tenetur amet accusantium dolores nam provident! Ipsum, dicta voluptatum quas architecto nostrum sapiente eos commodi numquam accusantium reprehenderit. diff --git a/examples/multilingual/content/about.et.md b/examples/multilingual/content/about.et.md index fd129f8e..be71772f 100644 --- a/examples/multilingual/content/about.et.md +++ b/examples/multilingual/content/about.et.md @@ -1,12 +1,12 @@ ---- -title: "Minust" -linktitle: "Minust" -url: /minust ++++ +title = "Minust" +linktitle = "Minust" +url = "/minust" -lang: "et" -menu: ["et"] -menu_weight: 30 ---- +lang = "et" +menu = ["et"] +menu_weight = 30 ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum ex deleniti ut tenetur amet accusantium dolores nam provident! Ipsum, dicta voluptatum quas architecto nostrum sapiente eos commodi numquam accusantium reprehenderit. diff --git a/examples/multilingual/content/index.en.md b/examples/multilingual/content/index.en.md index 7c769211..e819eacc 100644 --- a/examples/multilingual/content/index.en.md +++ b/examples/multilingual/content/index.en.md @@ -1,12 +1,12 @@ ---- -title: "" -linktitle: "Home" -url: / - -lang: "en" -menu: ["en"] -menu_weight: 0 ---- ++++ +title = "Home" +linktitle = "Home" +url = "/home" + +lang = "en" +menu = ["en"] +menu_weight = 0 ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum ex deleniti ut tenetur amet accusantium dolores nam provident! Ipsum, dicta voluptatum quas architecto nostrum sapiente eos commodi numquam accusantium reprehenderit. diff --git a/examples/multilingual/content/index.et.md b/examples/multilingual/content/index.et.md index fbcd7046..0de2d6a7 100644 --- a/examples/multilingual/content/index.et.md +++ b/examples/multilingual/content/index.et.md @@ -1,12 +1,12 @@ ---- -title: "" -linktitle: "Kodu" -url: /kodu - -lang: "et" -menu: ["et"] -menu_weight: 0 ---- ++++ +title = "Kodu" +linktitle = "Kodu" +url = "/kodu" + +lang = "et" +menu = ["et"] +menu_weight = 0 ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Illum ex deleniti ut tenetur amet accusantium dolores nam provident! Ipsum, dicta voluptatum quas architecto nostrum sapiente eos commodi numquam accusantium reprehenderit. diff --git a/examples/multilingual/content/story/alpha.md b/examples/multilingual/content/story/alpha.md index 558a7571..0cbbb5b3 100644 --- a/examples/multilingual/content/story/alpha.md +++ b/examples/multilingual/content/story/alpha.md @@ -1,9 +1,9 @@ ---- -title: "Alpha" ++++ +title = "Alpha" -lang: "en" -groups: ["news"] ---- +lang = "en" +groups = ["news"] ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ratione, porro, doloribus ducimus reprehenderit nobis at voluptates ipsa dicta nostrum perferendis in vitae. Magnam, quia officia modi incidunt tenetur ratione cum. diff --git a/examples/multilingual/content/story/beta.md b/examples/multilingual/content/story/beta.md index ece4463d..b098dc6c 100644 --- a/examples/multilingual/content/story/beta.md +++ b/examples/multilingual/content/story/beta.md @@ -1,9 +1,9 @@ ---- -title: "Beta" ++++ +title = "Beta" -lang: "en" -groups: ["news"] ---- +lang = "en" +groups = ["news"] ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ratione, porro, doloribus ducimus reprehenderit nobis at voluptates ipsa dicta nostrum perferendis in vitae. Magnam, quia officia modi incidunt tenetur ratione cum. diff --git a/examples/multilingual/content/story/index.md b/examples/multilingual/content/story/index.md index 2d35b716..00f92d3a 100644 --- a/examples/multilingual/content/story/index.md +++ b/examples/multilingual/content/story/index.md @@ -1,10 +1,10 @@ ---- -title: "News" -linktitle: "News" -url: /news -type: list ++++ +title = "News" +linktitle = "News" +url = "/news" -lang: "en" -menu: ["en"] -menu_weight: 10 ---- +listing = true +lang = "en" +menu = ["en"] +menu_weight = 10 ++++ diff --git a/examples/multilingual/content/uudis/alfa.md b/examples/multilingual/content/uudis/alfa.md index 7243795e..85f62718 100644 --- a/examples/multilingual/content/uudis/alfa.md +++ b/examples/multilingual/content/uudis/alfa.md @@ -1,9 +1,9 @@ ---- -title: "Alfa" ++++ +title = "Alfa" -lang: "et" -groups: ["uudised"] ---- +lang = "et" +groups = ["uudised"] ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ratione, porro, doloribus ducimus reprehenderit nobis at voluptates ipsa dicta nostrum perferendis in vitae. Magnam, quia officia modi incidunt tenetur ratione cum. diff --git a/examples/multilingual/content/uudis/beeta.md b/examples/multilingual/content/uudis/beeta.md index e90c3afd..a6823586 100644 --- a/examples/multilingual/content/uudis/beeta.md +++ b/examples/multilingual/content/uudis/beeta.md @@ -1,9 +1,9 @@ ---- -title: "Beeta" ++++ +title = "Beeta" -lang: "et" -groups: ["uudised"] ---- +lang = "et" +groups = ["uudised"] ++++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ratione, porro, doloribus ducimus reprehenderit nobis at voluptates ipsa dicta nostrum perferendis in vitae. Magnam, quia officia modi incidunt tenetur ratione cum. diff --git a/examples/multilingual/content/uudis/index.md b/examples/multilingual/content/uudis/index.md index c73b778a..48d092a3 100644 --- a/examples/multilingual/content/uudis/index.md +++ b/examples/multilingual/content/uudis/index.md @@ -1,10 +1,10 @@ ---- -title: "Uudised" -linktitle: "Uudised" -url: /uudised -type: list ++++ +title = "Uudised" +linktitle = "Uudised" +url = "/uudised" -lang: "et" -menu: ["et"] -menu_weight: 10 ---- +listing = true +lang = "et" +menu = ["et"] +menu_weight = 10 ++++ diff --git a/examples/multilingual/layouts/_default/single.html b/examples/multilingual/layouts/_default/single.html index 66e4a382..5a83414f 100644 --- a/examples/multilingual/layouts/_default/single.html +++ b/examples/multilingual/layouts/_default/single.html @@ -1,4 +1,4 @@ {{ partial "head.html" . }} {{ partial "header.html" . }} -{{ if .IsPage }}{{ .Content }}{{ end }} +{{ .Content }} {{ partial "footer.html" . }} diff --git a/examples/multilingual/layouts/partials/footer.html b/examples/multilingual/layouts/partials/footer.html index 2630b2e3..c5d0afa9 100644 --- a/examples/multilingual/layouts/partials/footer.html +++ b/examples/multilingual/layouts/partials/footer.html @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/examples/multilingual/layouts/partials/header.html b/examples/multilingual/layouts/partials/header.html index a244b8b0..59495da8 100644 --- a/examples/multilingual/layouts/partials/header.html +++ b/examples/multilingual/layouts/partials/header.html @@ -1,7 +1,7 @@