diff --git a/assets/images/icons/favicon.ico b/assets/images/icons/favicon.ico index f16453a..8c8e4c4 100644 Binary files a/assets/images/icons/favicon.ico and b/assets/images/icons/favicon.ico differ diff --git a/assets/sass/ie9.scss b/assets/scss/ie9.scss similarity index 100% rename from assets/sass/ie9.scss rename to assets/scss/ie9.scss diff --git a/assets/sass/libs/_functions.scss b/assets/scss/libs/_functions.scss similarity index 100% rename from assets/sass/libs/_functions.scss rename to assets/scss/libs/_functions.scss diff --git a/assets/sass/libs/_mixins.scss b/assets/scss/libs/_mixins.scss similarity index 100% rename from assets/sass/libs/_mixins.scss rename to assets/scss/libs/_mixins.scss diff --git a/assets/sass/libs/_skel.scss b/assets/scss/libs/_skel.scss similarity index 100% rename from assets/sass/libs/_skel.scss rename to assets/scss/libs/_skel.scss diff --git a/assets/sass/libs/_vars.scss b/assets/scss/libs/_vars.scss similarity index 100% rename from assets/sass/libs/_vars.scss rename to assets/scss/libs/_vars.scss diff --git a/assets/sass/main.scss b/assets/scss/main.scss similarity index 98% rename from assets/sass/main.scss rename to assets/scss/main.scss index a702708..4fe9744 100644 --- a/assets/sass/main.scss +++ b/assets/scss/main.scss @@ -11,7 +11,7 @@ Landed by HTML5 UP html5up.net | @ajlkn Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) -Modified by Toolbox Bodensee e.V. +Modified by C3WOC */ @include skel-breakpoints(( diff --git a/assets/sass/parts/_banner.scss b/assets/scss/parts/_banner.scss similarity index 100% rename from assets/sass/parts/_banner.scss rename to assets/scss/parts/_banner.scss diff --git a/assets/sass/parts/_basic.scss b/assets/scss/parts/_basic.scss similarity index 100% rename from assets/sass/parts/_basic.scss rename to assets/scss/parts/_basic.scss diff --git a/assets/sass/parts/_box.scss b/assets/scss/parts/_box.scss similarity index 100% rename from assets/sass/parts/_box.scss rename to assets/scss/parts/_box.scss diff --git a/assets/sass/parts/_button.scss b/assets/scss/parts/_button.scss similarity index 100% rename from assets/sass/parts/_button.scss rename to assets/scss/parts/_button.scss diff --git a/assets/sass/parts/_col.scss b/assets/scss/parts/_col.scss similarity index 100% rename from assets/sass/parts/_col.scss rename to assets/scss/parts/_col.scss diff --git a/assets/sass/parts/_dropotron.scss b/assets/scss/parts/_dropotron.scss similarity index 100% rename from assets/sass/parts/_dropotron.scss rename to assets/scss/parts/_dropotron.scss diff --git a/assets/sass/parts/_footer.scss b/assets/scss/parts/_footer.scss similarity index 100% rename from assets/sass/parts/_footer.scss rename to assets/scss/parts/_footer.scss diff --git a/assets/sass/parts/_form.scss b/assets/scss/parts/_form.scss similarity index 100% rename from assets/sass/parts/_form.scss rename to assets/scss/parts/_form.scss diff --git a/assets/sass/parts/_goto-next.scss b/assets/scss/parts/_goto-next.scss similarity index 100% rename from assets/sass/parts/_goto-next.scss rename to assets/scss/parts/_goto-next.scss diff --git a/assets/sass/parts/_header.scss b/assets/scss/parts/_header.scss similarity index 100% rename from assets/sass/parts/_header.scss rename to assets/scss/parts/_header.scss diff --git a/assets/sass/parts/_icon.scss b/assets/scss/parts/_icon.scss similarity index 100% rename from assets/sass/parts/_icon.scss rename to assets/scss/parts/_icon.scss diff --git a/assets/sass/parts/_image.scss b/assets/scss/parts/_image.scss similarity index 100% rename from assets/sass/parts/_image.scss rename to assets/scss/parts/_image.scss diff --git a/assets/sass/parts/_list.scss b/assets/scss/parts/_list.scss similarity index 100% rename from assets/sass/parts/_list.scss rename to assets/scss/parts/_list.scss diff --git a/assets/sass/parts/_loader.scss b/assets/scss/parts/_loader.scss similarity index 100% rename from assets/sass/parts/_loader.scss rename to assets/scss/parts/_loader.scss diff --git a/assets/sass/parts/_project.scss b/assets/scss/parts/_project.scss similarity index 100% rename from assets/sass/parts/_project.scss rename to assets/scss/parts/_project.scss diff --git a/assets/sass/parts/_section-article.scss b/assets/scss/parts/_section-article.scss similarity index 100% rename from assets/sass/parts/_section-article.scss rename to assets/scss/parts/_section-article.scss diff --git a/assets/sass/parts/_spotlight.scss b/assets/scss/parts/_spotlight.scss similarity index 100% rename from assets/sass/parts/_spotlight.scss rename to assets/scss/parts/_spotlight.scss diff --git a/assets/sass/parts/_startpage.scss b/assets/scss/parts/_startpage.scss similarity index 100% rename from assets/sass/parts/_startpage.scss rename to assets/scss/parts/_startpage.scss diff --git a/assets/sass/parts/_table.scss b/assets/scss/parts/_table.scss similarity index 100% rename from assets/sass/parts/_table.scss rename to assets/scss/parts/_table.scss diff --git a/assets/sass/parts/_wrapper.scss b/assets/scss/parts/_wrapper.scss similarity index 100% rename from assets/sass/parts/_wrapper.scss rename to assets/scss/parts/_wrapper.scss diff --git a/assets/sass/parts/_youtube.scss b/assets/scss/parts/_youtube.scss similarity index 100% rename from assets/sass/parts/_youtube.scss rename to assets/scss/parts/_youtube.scss diff --git a/configs/scss.ini b/configs/scss.ini index 9569ef1..0243b6f 100644 --- a/configs/scss.ini +++ b/configs/scss.ini @@ -1,3 +1,3 @@ -source_dir = assets/sass/ +source_dir = assets/scss/ output_dir = assets/css/ output_style = compressed diff --git a/databags/navigation.ini b/databags/navigation.ini index 19541f5..e85db32 100644 --- a/databags/navigation.ini +++ b/databags/navigation.ini @@ -5,6 +5,7 @@ home = Start Blog = Blog Rezept = Rezepte Kontakt = Kontakt +Finanzen = Finanzen Impressum = Impressum Datenschutz = Datenschutz xml = Rezepte als XML-Feed @@ -26,6 +27,7 @@ home = Start Blog = Blog Rezept = Recipes Kontakt = Contact +Finanzen = finances Impressum = Imprint Datenschutz = Data protection xml = Recipes as XML feed diff --git a/databags/settings.ini b/databags/settings.ini new file mode 100644 index 0000000..430c2b1 --- /dev/null +++ b/databags/settings.ini @@ -0,0 +1,2 @@ +[generic] +fqdn = c3woc.org diff --git a/templates/layout.html b/templates/layout.html index 3286164..6819262 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,227 +1,121 @@ -{% set fqdn = 'c3woc.de' -%}{% set ausnahmezustand = False -%} - +{%- from "macros/translator.j2" import translator -%} + + - - {% block title %}Startseite{% endblock %} - c3woc.de - - - - - - - - {% - if '/css/main.min.css'|asseturl == empty and '/css/main.css'|asseturl == empty %} - - {% - endif %} - - - {% block expand_description - %}{% - endblock %} - - - - - - - - - {% - block expand_header %}{% endblock %} - - + + {%- block title -%} + Startseite + {%- endblock -%} + + {%- block expand_description %} + + {%- endblock %} + {%- block expand_header %} + {%- endblock %} + {% include "partials/head.html" -%} + + - + +
- - {# - - Und hier werden nun die eientlichen Seiten eingebunden... - - #} - -{% if ausnahmezustand %} - - - -
-{% else %} - -{% endif %} -{% block body %}{% endblock %} - -{% if ausnahmezustand %} -
- - -{% endif %} - + + + + + + + {%- block body %} + {%- endblock %}