Fix multilingual site layouts/templates.

diff --git a/examples/multilingual/config.toml b/examples/multilingual/config.toml
index 4285f302d0298b71b50f77890ab42c9529e937ab..9f436859a64cb4dc7b1946848184e03846f0a5e1 100644 (file)
--- 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 a47d1d9237fad97344c271b70421bc8bff34847d..9a7b497c549aedeca16e354254a45541face36ea 100644 (file)
--- a/examples/multilingual/content/about.en.md
+++ b/examples/multilingual/content/about.en.md
@@ -1,12 +1,12 @@
----\r
-title: "About"\r
-linktitle: "About"\r
-url: /about\r
++++\r
+title = "About"\r
+linktitle = "About"\r
+url = "/about"\r
 \r
-lang: "en"\r
-menu: ["en"]\r
-menu_weight: 30\r
----\r
+lang = "en"\r
+menu = ["en"]\r
+menu_weight = 30\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/about.et.md b/examples/multilingual/content/about.et.md
index fd129f8e8104f65ae43cb5f00ea04975d17539a4..be71772fbeb81af8fa29a1461d49b33b03e08600 100644 (file)
--- a/examples/multilingual/content/about.et.md
+++ b/examples/multilingual/content/about.et.md
@@ -1,12 +1,12 @@
----\r
-title: "Minust"\r
-linktitle: "Minust"\r
-url: /minust\r
++++\r
+title = "Minust"\r
+linktitle = "Minust"\r
+url = "/minust"\r
 \r
-lang: "et"\r
-menu: ["et"]\r
-menu_weight: 30\r
----\r
+lang = "et"\r
+menu = ["et"]\r
+menu_weight = 30\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/index.en.md b/examples/multilingual/content/index.en.md
index 7c769211aba9145be61e54fab96dbe399b6b8d16..e819eacca6191b253c8cdd2e68a06367958259eb 100644 (file)
--- a/examples/multilingual/content/index.en.md
+++ b/examples/multilingual/content/index.en.md
@@ -1,12 +1,12 @@
----\r
-title: ""\r
-linktitle: "Home"\r
-url: /\r
-\r
-lang: "en"\r
-menu: ["en"]\r
-menu_weight: 0\r
----\r
++++\r
+title = "Home"\r
+linktitle = "Home"\r
+url = "/home"\r
+\r
+lang = "en"\r
+menu = ["en"]\r
+menu_weight = 0\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/index.et.md b/examples/multilingual/content/index.et.md
index fbcd70466ee68b0d9ca5375a534d914fda2d000d..0de2d6a7185b670572f4f98484f60817f48c8894 100644 (file)
--- a/examples/multilingual/content/index.et.md
+++ b/examples/multilingual/content/index.et.md
@@ -1,12 +1,12 @@
----\r
-title: ""\r
-linktitle: "Kodu"\r
-url: /kodu\r
-\r
-lang: "et"\r
-menu: ["et"]\r
-menu_weight: 0\r
----\r
++++\r
+title = "Kodu"\r
+linktitle = "Kodu"\r
+url = "/kodu"\r
+\r
+lang = "et"\r
+menu = ["et"]\r
+menu_weight = 0\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/story/alpha.md b/examples/multilingual/content/story/alpha.md
index 558a7571f4017c5fb4a032dd48eb24f085e05b19..0cbbb5b31ee4d16a42ff1b42a242b13547a4333c 100644 (file)
--- a/examples/multilingual/content/story/alpha.md
+++ b/examples/multilingual/content/story/alpha.md
@@ -1,9 +1,9 @@
----\r
-title: "Alpha"\r
++++\r
+title = "Alpha"\r
 \r
-lang: "en"\r
-groups: ["news"]\r
----\r
+lang = "en"\r
+groups = ["news"]\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/story/beta.md b/examples/multilingual/content/story/beta.md
index ece4463d45328de4271908367c800e0a3fb1da05..b098dc6cfacc30c0697290a8fa1512d3bbaf4cf6 100644 (file)
--- a/examples/multilingual/content/story/beta.md
+++ b/examples/multilingual/content/story/beta.md
@@ -1,9 +1,9 @@
----\r
-title: "Beta"\r
++++\r
+title = "Beta"\r
 \r
-lang: "en"\r
-groups: ["news"]\r
----\r
+lang = "en"\r
+groups = ["news"]\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/story/index.md b/examples/multilingual/content/story/index.md
index 2d35b716b1815d72002ba1b11b25e1f42cf27356..00f92d3ad212fbdf8ae0ed0013d61dd3b43665aa 100644 (file)
--- a/examples/multilingual/content/story/index.md
+++ b/examples/multilingual/content/story/index.md
@@ -1,10 +1,10 @@
----\r
-title: "News"\r
-linktitle: "News"\r
-url: /news\r
-type: list\r
++++\r
+title = "News"\r
+linktitle = "News"\r
+url = "/news"\r
 \r
-lang: "en"\r
-menu: ["en"]\r
-menu_weight: 10\r
----\r
+listing = true\r
+lang = "en"\r
+menu = ["en"]\r
+menu_weight = 10\r
++++\r

diff --git a/examples/multilingual/content/uudis/alfa.md b/examples/multilingual/content/uudis/alfa.md
index 7243795ec0fa8659daf770d9e8461b04cd46366b..85f62718dab2b7b6271531d57834027c41905aa6 100644 (file)
--- a/examples/multilingual/content/uudis/alfa.md
+++ b/examples/multilingual/content/uudis/alfa.md
@@ -1,9 +1,9 @@
----\r
-title: "Alfa"\r
++++\r
+title = "Alfa"\r
 \r
-lang: "et"\r
-groups: ["uudised"]\r
----\r
+lang = "et"\r
+groups = ["uudised"]\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/uudis/beeta.md b/examples/multilingual/content/uudis/beeta.md
index e90c3afd212c829167d3356038dd3b1eb518d85f..a6823586e224b4232e22be788c1a79f2952e0432 100644 (file)
--- a/examples/multilingual/content/uudis/beeta.md
+++ b/examples/multilingual/content/uudis/beeta.md
@@ -1,9 +1,9 @@
----\r
-title: "Beeta"\r
++++\r
+title = "Beeta"\r
 \r
-lang: "et"\r
-groups: ["uudised"]\r
----\r
+lang = "et"\r
+groups = ["uudised"]\r
++++\r
 \r
 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.\r
 \r

diff --git a/examples/multilingual/content/uudis/index.md b/examples/multilingual/content/uudis/index.md
index c73b778abb540acb8f122cd48790e3c3bd97c68b..48d092a37a8b6edf3fd84bbc33ba1771e175ba0a 100644 (file)
--- a/examples/multilingual/content/uudis/index.md
+++ b/examples/multilingual/content/uudis/index.md
@@ -1,10 +1,10 @@
----\r
-title: "Uudised"\r
-linktitle: "Uudised"\r
-url: /uudised\r
-type: list\r
++++\r
+title = "Uudised"\r
+linktitle = "Uudised"\r
+url = "/uudised"\r
 \r
-lang: "et"\r
-menu: ["et"]\r
-menu_weight: 10\r
----\r
+listing = true\r
+lang = "et"\r
+menu = ["et"]\r
+menu_weight = 10\r
++++\r

diff --git a/examples/multilingual/layouts/_default/single.html b/examples/multilingual/layouts/_default/single.html
index 66e4a38281d486fdce4c455c1fa6f8be0b0ac7fc..5a83414f8d5c5d3f5f2632b1d938979dd4cd6227 100644 (file)
--- a/examples/multilingual/layouts/_default/single.html
+++ b/examples/multilingual/layouts/_default/single.html
@@ -1,4 +1,4 @@
 {{ partial "head.html" . }}\r
 {{ partial "header.html" . }}\r
-{{ if .IsPage }}{{ .Content }}{{ end }}\r
+{{ .Content }}\r
 {{ partial "footer.html" . }}\r

diff --git a/examples/multilingual/layouts/partials/footer.html b/examples/multilingual/layouts/partials/footer.html
index 2630b2e32d184f7a32ef5a295e13a26f6afb1bc2..c5d0afa945b5b23a1b880b7a698a3c2c3428f40c 100644 (file)
--- a/examples/multilingual/layouts/partials/footer.html
+++ b/examples/multilingual/layouts/partials/footer.html
@@ -1,3 +1,3 @@
-       <footer>(Ↄ) 2013 Egon Elbre</footer>\r
+       <footer>(Ↄ) 2015 example.com</footer>\r
 </body>\r
 </html>
\ No newline at end of file

diff --git a/examples/multilingual/layouts/partials/header.html b/examples/multilingual/layouts/partials/header.html
index a244b8b0c3128fc3806ea675f87cce43fabdd32b..59495da8f4c760ddca1fdb62cfa0edd1257796a5 100644 (file)
--- a/examples/multilingual/layouts/partials/header.html
+++ b/examples/multilingual/layouts/partials/header.html
@@ -1,7 +1,7 @@
 <header>\r
        <nav class="menu language-menu">\r
                <ul>\r
-                       <li><a href="/">English</a></li>\r
+                       <li><a href="/home">English</a></li>\r
                        <li><a href="/kodu">Eesti</a></li>\r
                </ul>\r
                <div class="clear"></div>\r
@@ -15,7 +15,7 @@
 \r
        <nav class="menu main-menu">\r
                <ul>\r
-                       {{ range (index .Site.Indexes.menu .Params.lang).Pages }}\r
+                       {{ range (index .Site.Taxonomies.menu .Params.lang).Pages }}\r
                        <li><a href="{{ .Permalink  }}">{{ .LinkTitle }}</a></li>\r
                        {{ end }}\r
                </ul>\r

diff --git a/examples/multilingual/layouts/story/list.html b/examples/multilingual/layouts/story/list.html
deleted file mode 100644 (file)
index a753577..0000000
--- a/examples/multilingual/layouts/story/list.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{ partial "head.html" . }}\r
-{{ partial "header.html" . }}\r
-{{ range .Site.Indexes.groups.news.Pages }}\r
-<article class="post">\r
-       <header>\r
-               <h2><a href='{{ .Permalink }}'>{{ .Title }}</a> </h2>\r
-               <div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words</div>\r
-       </header>\r
-       {{ .Summary }}\r
-       <footer>\r
-               <a href='{{ .Permalink }}'><nobr>Read more →</nobr></a>\r
-       </footer>\r
-</article>\r
-{{ end }}\r
-{{ partial "footer.html" . }}\r

diff --git a/examples/multilingual/layouts/uudis/list.html b/examples/multilingual/layouts/uudis/list.html
deleted file mode 100644 (file)
index 23c0dae..0000000
--- a/examples/multilingual/layouts/uudis/list.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{ partial "head.html" . }}\r
-{{ partial "header.html" . }}\r
-{{ range .Site.Indexes.groups.uudised.Pages }}\r
-<article class="post">\r
-       <header>\r
-               <h2><a href='{{ .Permalink }}'>{{ .Title }}</a> </h2>\r
-               <div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} sõna</div>\r
-       </header>\r
-       {{ .Summary }}\r
-       <footer>\r
-               <a href='{{ .Permalink }}'><nobr>Loe rohkem →</nobr></a>\r
-       </footer>\r
-</article>\r
-{{ end }}\r
-{{ partial "footer.html" . }}\r

diff --git a/examples/multilingual/static/static/main.css b/examples/multilingual/static/static/main.css
index 59ccaf8f065c4e86df6c80f337516e12cc484cfd..bf8284d5679b9be20a8699f9144dd223e0e1edb8 100644 (file)
--- a/examples/multilingual/static/static/main.css
+++ b/examples/multilingual/static/static/main.css
@@ -77,7 +77,7 @@ header {
     clear: both;\r
 }\r
 \r
-footer {\r
+body > footer {\r
     font-family: Georgia;\r
     background: #eee;\r
     margin: 0;\r