diff --git a/theme/templates/Makefile b/theme/templates/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..396366804620681312cf4cb22a4f89294ed09b6f
--- /dev/null
+++ b/theme/templates/Makefile
@@ -0,0 +1,3 @@
+.PHONY: run
+run:
+ make -C ../../fgs
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 6466a8f7566c435c8e4cba8909ab67d03bbc5a38..11e95161be495c6cf108971409aaa21c5835ee30 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -1,42 +1,30 @@
<!DOCTYPE html>
-{#- TODO lang irgendwie vernünftig setzen/erkennen -#}
-{%- if lang is not defined -%}
- {%- set lang = DEFAULT_LANG -%}
-{%- else -%}
-Hurra!!! lang ist definiert als {{ lang }}.
-{{ diese_variable_existiert_nicht_werfe_fehler }}
-{%- endif -%}
-
-{%- import 'macros/getters.html' as get with context -%}
-{%- import 'macros/cards.html' as cards with context -%}
-{%- import 'macros/renderers.html' as render with context -%}
-
-<html lang="{%- block html_lang -%}{{ DEFAULT_LANG }}{%- endblock html_lang -%}">
+<html lang="{%- block html_lang -%}{{ l }}{%- endblock html_lang -%}">
<head>
{% block head %}
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>{% block title %}{{ l[lang].title_prefix }}{{ l[lang].sitename }}{{ l[lang].title_suffix }}{%endblock%}</title>
+ <title>{% block title %}{{ t[l].title_prefix }}{{ t[l].sitename }}{{ t[l].title_suffix }}{%endblock%}</title>
<!-- <base target="_blank"> -->
<!-- <meta HTTP-EQUIV="REFRESH" content="500; url=#"> -->
- <link rel="preload" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" as="style" />
- <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
+ <link rel="preload" href="{{ siteurl }}/{{ theme.static_dir }}/css/{{ theme.css_file }}" as="style" />
+ <link rel="stylesheet" type="text/css" href="{{ siteurl }}/{{ theme.static_dir }}/css/{{ theme.css_file }}" />
{#- TODO load javascript? -#}
{#- TODO og: meta tags -#}
{#- TODO favicon -#}
<!-- <link rel="icon" type="image/png" sizes="192x192" href="static/img/favicon-192x192.png"/>
<link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png"/>-->
<!-- <link rel="icon" type="image/x-icon" sizes="16x16" href="static/img/favicon.ico"/> -->
- {%- if FEED_ALL_ATOM %}
- <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ l[lang].atom.title|e }}" />
- {% endif -%}
+ {#{%- if FEED_ALL_ATOM %}
+ <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ t[l].atom.title|e }}" />
+ {% endif -%}#}
{% block extra_head %}{% endblock extra_head %}
{% endblock head %}
</head>
<body>
<header>
{% block header %}
- <h1><a href="{{ SITEURL }}/" title="{{ l[lang].banner.title|e }}" ><img alt="{{ l[lang].banner.alt|e }}" src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/banner-logo.png"><span>{{ l[lang].banner.prefix|e }}{{ l[lang].sitename|e }}{{ l[lang].banner.suffix|e }}</span></a></h1>
+ <h1><a href="{{ siteurl }}/{{ l }}/" title="{{ t[l].banner.title|e }}" ><img alt="{{ t[l].banner.alt|e }}" src="{{ siteurl }}/{{ theme.static_dir }}/images/banner-logo.png"><span>{{ t[l].banner.prefix|e }}{{ t[l].sitename|e }}{{ t[l].banner.suffix|e }}</span></a></h1>
{% block extra_header %}{% endblock extra_header %}
{% endblock header %}
</header>
@@ -46,19 +34,17 @@ Hurra!!! lang ist definiert als {{ lang }}.
<label for="show-header-menu" class="show-header-menu-bg"> </label>
<nav>
<ul>
- {% for item in sc.menuitems -%}
- {%- if item.category is defined -%}
- {%- call(nativecat, sccat, _) get.category_by_name(item.category) -%}
- <li style="--category-color: {{ sccat.color }}"><a href="{{ SITEURL }}/{{ nativecat.url }}">{{ sccat[lang]|e }}</a></li>
- {%- endcall -%}
- {%- elif item.tag is defined -%}
+ {% for item in config.menuitems -%}
+ {{item}}
+ {#
+ {%- if item.tag is defined -%}
{%- call(nativetag, sccat, _) get.tag_by_name(item.tag) -%}
- <li style="--category-color: {{ sccat.color }}"><a href="{{ SITEURL }}/{{ nativetag.url }}">{{ sccat[lang]|e }}</a></li>
+ <li style="--category-color: {{ sccat.color }}"><a href="{{ siteurl }}/{{ nativetag.url }}">{{ sccat[lang]|e }}</a></li>
{%- endcall -%}
{%- elif item.slug is defined -%}
{%- call(aop, _) get.article_or_page_by_slug(item.slug, lang) -%}
{%- call(__, sccat, ___) get.category_by_name(aop.category.name, True) -%}
- <li style="--category-color: {{ sccat.color }}"><a href="{{ SITEURL }}/{{ aop.url }}">{{ aop.title }}</a></li>
+ <li style="--category-color: {{ sccat.color }}"><a href="{{ siteurl }}/{{ aop.url }}">{{ aop.title }}</a></li>
{%- endcall -%}
{%- endcall -%}
{%- else -%}
@@ -66,6 +52,7 @@ Hurra!!! lang ist definiert als {{ lang }}.
<strong>ERROR: menuitems: Cannot parse item: {{ item|string|e }}</strong><br />
<br />
{%- endif -%}
+ #}
{#- TODO add active class if this is the current site -#}
{%- endfor %}
</ul>
diff --git a/theme/templates/page.html b/theme/templates/page.html
index af4e389ee2929cd5d3155aac3a7f8cd914899e2f..16ed52c75fa8a9d8d5f7f9d8396087665aa9601f 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,8 +1,8 @@
{% extends "base.html" %}
{%- macro page_translation_link(translation, is_current=False) -%}
-<a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}" title="{{ l[translation.lang].langname|e }}">
- <img alt="{{ l[translation.lang].langname|e }}" src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/flags/{{ translation.lang }}.svg">
+<a href="{{ siteurl }}/{{ translation.url }}" hreflang="{{ translation.lang }}" title="{{ l[translation.lang].langname|e }}">
+ <img alt="{{ l[translation.lang].langname|e }}" src="{{ siteurl }}/{{ THEME_STATIC_DIR }}/images/flags/{{ translation.lang }}.svg">
</a>
{%- endmacro -%}
@@ -12,7 +12,7 @@
{% block extra_head %}
{%- for translation in page.translations -%}
- <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
+ <link rel="alternate" hreflang="{{ translation.lang }}" href="{{ siteurl }}/{{ translation.url }}">
{%- endfor -%}
{% if page.summary %}
@@ -29,31 +29,31 @@
<footer>
{%- if page.authors -%}
<address>
- {{ l[lang].page.authors_prefix }}
+ {{ t[l].page.authors_prefix }}
{% for author in page.authors %}
- <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+ <a href="{{ siteurl }}/{{ author.url }}">{{ author }}</a>
{% endfor %}
- {{ l[lang].page.authors_suffix }}
+ {{ t[l].page.authors_suffix }}
</address>
{%- endif -%}
- <span>{{ l[lang].page.published_prefix }}
- <abbr title="{{ page.date.isoformat() }}">
- {{ page.locale_date }}
- </abbr>{{ l[lang].page.published_suffix }}</span>
+ <span>{{ t[l].page.published_prefix }}
+ <abbr title="{{ page.date_created.isoformat() }}">
+ {{ page.date_created.isoformat() }}
+ </abbr>{{ t[l].page.published_suffix }}</span>
{%- if page.modified -%}
<br />
- <span>{{ l[lang].page.modified_prefix }}
+ <span>{{ t[l].page.modified_prefix }}
<abbr title="{{ page.modified.isoformat() }}">{{ page.locale_modified }}</abbr>
- {{ l[lang].page.modified_suffix }}</span>
+ {{ t[l].page.modified_suffix }}</span>
{%- endif -%}
<br />
- <span>{{ l[lang].page.category_prefix }}<a href="{{ SITEURL }}/{{ page.category.url }}">{{ page.category }}</a>{{ l[lang].page.category_suffix }}</span>
+ <span>{{ t[l].page.category_prefix }}<a href="{{ siteurl }}/{{ page.category.url }}">{{ page.category }}</a>{{ t[l].page.category_suffix }}</span>
<br />
- <span>{{ l[lang].page.languages_prefix }}</span>
- <ul class="languages">
+ <span>{{ t[l].page.languages_prefix }}</span>
+ {#<ul class="languages">
{%- for translation in page.translations -%}
<li>
{{ page_translation_link(translation) }}
@@ -62,8 +62,8 @@
<li>
{{ page_translation_link(page, True) }}
</li>
- </ul>
- {{ l[lang].page.languages_suffix }}
+ </ul>#}
+ {{ t[l].page.languages_suffix }}
</footer>
</article>
{% endblock %}