diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2020-06-08 12:46:18 +0200 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2020-06-08 12:49:42 +0200 |
| commit | a7b926e48eb1a34a72c8123b44438b3d8afef224 (patch) | |
| tree | 7eb689425ad51a32105aebdc4c6d34dab5f07150 | |
| parent | 90a04beaed62c8c93140800eb11c7f4153d06b62 (diff) | |
| download | rabalderz-a7b926e48eb1a34a72c8123b44438b3d8afef224.tar.gz rabalderz-a7b926e48eb1a34a72c8123b44438b3d8afef224.tar.bz2 rabalderz-a7b926e48eb1a34a72c8123b44438b3d8afef224.zip | |
Add translation links in site header.
Add translation links in the site header for sections and index.
This also moved the header back into the base template, as it seems zola
is not able to handle blocks defined in included templates. At least
that's what it looked like. Didn't test much.
| -rw-r--r-- | config.toml | 2 | ||||
| -rw-r--r-- | sass/styles.scss | 7 | ||||
| -rw-r--r-- | templates/base.html | 8 | ||||
| -rw-r--r-- | templates/header.html | 4 | ||||
| -rw-r--r-- | templates/index.html | 14 | ||||
| -rw-r--r-- | templates/section.html | 5 | ||||
| -rw-r--r-- | templates/translation-links.html | 8 |
7 files changed, 32 insertions, 16 deletions
diff --git a/config.toml b/config.toml index 38c9bd6..3aee023 100644 --- a/config.toml +++ b/config.toml @@ -30,6 +30,7 @@ description = "En blogg om samfunn, teknologi, internett, overvåkning og annet moreprompt = "Les mer..." latest = "Siste innlegg:" allposts = "se alle innleggene i" +read_in = "Les på" en = "English" nb = "norsk" @@ -38,6 +39,7 @@ description = "A blog about society, technology, internet, surveillance and othe moreprompt = "More..." latest = "Latest posts:" allposts = "View all posts in" +read_in = "Read in" en = "english" nb = "Norsk" diff --git a/sass/styles.scss b/sass/styles.scss index 0a696bf..76a75ab 100644 --- a/sass/styles.scss +++ b/sass/styles.scss @@ -27,16 +27,19 @@ pre { color: #ccc; font-size: 200%; } - .site-description { + .site-bar { + display: flex; + justify-content: space-between; background-color: #000; color: #ccc; font-size: x-small; } + } .page-content, .site-title, -.site-description { +.site-bar { @media(min-width: 960px) { padding-left: 5rem; padding-right: 5rem; diff --git a/templates/base.html b/templates/base.html index 1d7b588..e1280e2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,13 @@ <body> - {% include "header.html" %} + <header id="site-header" class="site-header"> + <div class="site-title">{{ config.title }}</div> + <div class="site-bar"> + <div class="site-description">{{ trans(key="description", lang=lang) }}</div> + <div class="language">{% block language %}{% endblock language %}</div> + </div> + </header> <div class="page-content"> <div class="wrapper"> diff --git a/templates/header.html b/templates/header.html deleted file mode 100644 index ad0951f..0000000 --- a/templates/header.html +++ /dev/null @@ -1,4 +0,0 @@ -<header id="site-header" class="site-header"> - <div class="site-title">{{ config.title }}</div> - <div class="site-description">{{ trans(key="description", lang=lang) }}</div> -</header> diff --git a/templates/index.html b/templates/index.html index 48857c4..0296444 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,17 +1,13 @@ {% extends "base.html" %} -{% block content %} +{% block language %} +{% set translations = section.translations %} +{% include "translation-links.html" %} +{% endblock language %} +{% block content %} <section id="home-blurb"> {{ section.content | safe }} </section> -<section id="translations"> - This page is also available in: - {% for l in section.translations %} - {% if l.lang != lang %} - <a href="{{ l.permalink | safe }}">{{ trans(key=l.lang) }}</a> - {% endif %} - {% endfor %} -</section> <section class="subsections"> {% for sub in section.subsections %} diff --git a/templates/section.html b/templates/section.html index fed7472..0440afa 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,4 +1,9 @@ {% extends "base.html" %} +{% block language %} +{% set translations = section.translations %} +{% include "translation-links.html" %} +{% endblock language %} + {% block content %} <h1>{{ section.title }}</h1> diff --git a/templates/translation-links.html b/templates/translation-links.html new file mode 100644 index 0000000..c87f01a --- /dev/null +++ b/templates/translation-links.html @@ -0,0 +1,8 @@ +<span class="translations"> + {% for l in translations %} + {% if l.lang != lang %} + {{ trans(key="read_in", lang=l.lang) }} + <a href="{{ l.permalink | safe }}">{{ trans(key=l.lang) }}</a> + {% endif %} + {% endfor %} +</span> |