From 9141aced4e6a35c942c5295e0cf69c689c1df283 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 10 Jan 2018 00:24:44 +0100 Subject: [PATCH] first testing with gutenberg render engine --- .config.toml.swp | Bin 0 -> 12288 bytes config.toml | 14 +++ content/_index.md | 17 ++++ content/datenschutz.md | 16 ++++ content/impressum.md | 33 +++++++ content/wer.md | 17 ++++ render.py | 53 ----------- {files => static}/0x1D7AE62C.asc | 0 .../lederouter_fuers_heimnetzwerk.md | 0 {files => static}/satzung-des-reudnetzes.pdf | Bin {style => static/style}/fitgrid.css | 0 .../style}/introheadr-base-webfont.eot | Bin .../style}/introheadr-base-webfont.svg | 0 .../style}/introheadr-base-webfont.ttf | Bin .../style}/introheadr-base-webfont.woff | Bin .../style}/introheadr-base-webfont.woff2 | Bin .../style}/introrustg-base2line-webfont.eot | Bin .../style}/introrustg-base2line-webfont.svg | 0 .../style}/introrustg-base2line-webfont.ttf | Bin .../style}/introrustg-base2line-webfont.woff | Bin .../style}/introrustg-base2line-webfont.woff2 | Bin .../style}/introscriptr-h2base-webfont.eot | Bin .../style}/introscriptr-h2base-webfont.svg | 0 .../style}/introscriptr-h2base-webfont.ttf | Bin .../style}/introscriptr-h2base-webfont.woff | Bin .../style}/introscriptr-h2base-webfont.woff2 | Bin {style => static/style}/linien1.svg | 0 {style => static/style}/styles.css | 0 templates/datenschutz.html | 22 ----- templates/footer.html.j2 | 5 - templates/header.html.j2 | 13 --- templates/impressum.html | 40 -------- templates/index.html | 88 ++++++++++++++---- templates/nav.html.j2 | 19 ---- templates/page.html | 9 ++ {templates => templates_old}/404.html | 0 .../anleitungen/router.html | 0 templates_old/index.html | 38 ++++++++ {templates => templates_old}/skeleton.html.j2 | 0 {templates => templates_old}/warum.html | 0 {templates => templates_old}/was.html | 0 {templates => templates_old}/wer.html | 0 {templates => templates_old}/wie.html | 0 {templates => templates_old}/wiki.html | 0 44 files changed, 216 insertions(+), 168 deletions(-) create mode 100644 .config.toml.swp create mode 100644 config.toml create mode 100755 content/_index.md create mode 100755 content/datenschutz.md create mode 100755 content/impressum.md create mode 100755 content/wer.md delete mode 100755 render.py rename {files => static}/0x1D7AE62C.asc (100%) rename {files => static}/lederouter_fuers_heimnetzwerk.md (100%) rename {files => static}/satzung-des-reudnetzes.pdf (100%) rename {style => static/style}/fitgrid.css (100%) rename {style => static/style}/introheadr-base-webfont.eot (100%) rename {style => static/style}/introheadr-base-webfont.svg (100%) rename {style => static/style}/introheadr-base-webfont.ttf (100%) rename {style => static/style}/introheadr-base-webfont.woff (100%) rename {style => static/style}/introheadr-base-webfont.woff2 (100%) rename {style => static/style}/introrustg-base2line-webfont.eot (100%) rename {style => static/style}/introrustg-base2line-webfont.svg (100%) rename {style => static/style}/introrustg-base2line-webfont.ttf (100%) rename {style => static/style}/introrustg-base2line-webfont.woff (100%) rename {style => static/style}/introrustg-base2line-webfont.woff2 (100%) rename {style => static/style}/introscriptr-h2base-webfont.eot (100%) rename {style => static/style}/introscriptr-h2base-webfont.svg (100%) rename {style => static/style}/introscriptr-h2base-webfont.ttf (100%) rename {style => static/style}/introscriptr-h2base-webfont.woff (100%) rename {style => static/style}/introscriptr-h2base-webfont.woff2 (100%) rename {style => static/style}/linien1.svg (100%) rename {style => static/style}/styles.css (100%) delete mode 100755 templates/datenschutz.html delete mode 100644 templates/footer.html.j2 delete mode 100644 templates/header.html.j2 delete mode 100755 templates/impressum.html mode change 100755 => 100644 templates/index.html delete mode 100644 templates/nav.html.j2 create mode 100644 templates/page.html rename {templates => templates_old}/404.html (100%) rename {templates => templates_old}/anleitungen/router.html (100%) create mode 100755 templates_old/index.html rename {templates => templates_old}/skeleton.html.j2 (100%) rename {templates => templates_old}/warum.html (100%) rename {templates => templates_old}/was.html (100%) rename {templates => templates_old}/wer.html (100%) rename {templates => templates_old}/wie.html (100%) rename {templates => templates_old}/wiki.html (100%) diff --git a/.config.toml.swp b/.config.toml.swp new file mode 100644 index 0000000000000000000000000000000000000000..e810dd4134975cd0adad7442472a24f679cb1d1a GIT binary patch literal 12288 zcmeI&&59F25C`yDui^*#0G7$w%&G?$!LtY|%W76|m2A&UO{SqUJ#<%_jfdUW@ThO$ zitiwveG8w!nn{e}DSPk`sA2vz1JyM>Kggj;=evhbp5fkT7v#DQ@a_5d_0P*+p)mk* zZ**18@Fs<)CX1oS0;RGcexJ=LkCrJbd{f!!i2clM(nf1kKm{%;khr?DcLna>yW9WN zhlAUA^Tzn1U9?^WR6qq(Km}Al1yn!S^uTgH(XtfJO7NUM;%l^1yn!< zR6qq(Km}Al1yn! +Wenn ihr uns kennenlernen wollt, schreibt doch eine Mail und lasst euch zu einem persönlichen Treffen einladen. + + +### Dokumente des Vereins + +[Satzung](satzung-des-reudnetzes.pdf) + +### Der Verein ist vertreten durch diff --git a/render.py b/render.py deleted file mode 100755 index 96c8d15..0000000 --- a/render.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/python3 - -from jinja2 import Environment, FileSystemLoader -import os -import stat -import shutil - -TEMPLATE_PATH = "templates" -PUBLIC_PATH = "/var/www/reudnetz.org/" - -files = os.path.join(PUBLIC_PATH, "files") -style = os.path.join(PUBLIC_PATH, "style") - - - -if not os.path.exists(TEMPLATE_PATH): - os.mkdirs(TEMPLATE_PATH) - -if not os.path.exists(PUBLIC_PATH): - os.makedirs(PUBLIC_PATH) - -os.chdir(os.path.dirname(os.path.abspath(__file__))) - -env = Environment(loader=FileSystemLoader(TEMPLATE_PATH)) - -for template in filter(lambda x : x.endswith(".html"), env.list_templates()): - rendered = env.get_template(template).render(name=template).encode('utf-8') - output_file = os.path.join(PUBLIC_PATH, template) - if os.path.exists(output_file): - os.chmod(output_file, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH) - with open(os.path.join(PUBLIC_PATH, template), 'wb') as outfile: - outfile.write(rendered) - os.chmod(output_file, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH) - -if not os.path.exists(files): - os.makedirs(files) - -for filename in os.listdir("files"): - output_file = os.path.join(files, filename) - if os.path.exists(output_file): - os.chmod(output_file, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH) - shutil.copy(os.path.join("files", filename), output_file) - os.chmod(output_file, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH) - -if not os.path.exists(style): - os.makedirs(style) - -for filename in os.listdir("style"): - output_file = os.path.join(style, filename) - if os.path.exists(output_file): - os.chmod(output_file, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH) - shutil.copy(os.path.join("style", filename), output_file) - os.chmod(output_file, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH) diff --git a/files/0x1D7AE62C.asc b/static/0x1D7AE62C.asc similarity index 100% rename from files/0x1D7AE62C.asc rename to static/0x1D7AE62C.asc diff --git a/files/lederouter_fuers_heimnetzwerk.md b/static/lederouter_fuers_heimnetzwerk.md similarity index 100% rename from files/lederouter_fuers_heimnetzwerk.md rename to static/lederouter_fuers_heimnetzwerk.md diff --git a/files/satzung-des-reudnetzes.pdf b/static/satzung-des-reudnetzes.pdf similarity index 100% rename from files/satzung-des-reudnetzes.pdf rename to static/satzung-des-reudnetzes.pdf diff --git a/style/fitgrid.css b/static/style/fitgrid.css similarity index 100% rename from style/fitgrid.css rename to static/style/fitgrid.css diff --git a/style/introheadr-base-webfont.eot b/static/style/introheadr-base-webfont.eot similarity index 100% rename from style/introheadr-base-webfont.eot rename to static/style/introheadr-base-webfont.eot diff --git a/style/introheadr-base-webfont.svg b/static/style/introheadr-base-webfont.svg similarity index 100% rename from style/introheadr-base-webfont.svg rename to static/style/introheadr-base-webfont.svg diff --git a/style/introheadr-base-webfont.ttf b/static/style/introheadr-base-webfont.ttf similarity index 100% rename from style/introheadr-base-webfont.ttf rename to static/style/introheadr-base-webfont.ttf diff --git a/style/introheadr-base-webfont.woff b/static/style/introheadr-base-webfont.woff similarity index 100% rename from style/introheadr-base-webfont.woff rename to static/style/introheadr-base-webfont.woff diff --git a/style/introheadr-base-webfont.woff2 b/static/style/introheadr-base-webfont.woff2 similarity index 100% rename from style/introheadr-base-webfont.woff2 rename to static/style/introheadr-base-webfont.woff2 diff --git a/style/introrustg-base2line-webfont.eot b/static/style/introrustg-base2line-webfont.eot similarity index 100% rename from style/introrustg-base2line-webfont.eot rename to static/style/introrustg-base2line-webfont.eot diff --git a/style/introrustg-base2line-webfont.svg b/static/style/introrustg-base2line-webfont.svg similarity index 100% rename from style/introrustg-base2line-webfont.svg rename to static/style/introrustg-base2line-webfont.svg diff --git a/style/introrustg-base2line-webfont.ttf b/static/style/introrustg-base2line-webfont.ttf similarity index 100% rename from style/introrustg-base2line-webfont.ttf rename to static/style/introrustg-base2line-webfont.ttf diff --git a/style/introrustg-base2line-webfont.woff b/static/style/introrustg-base2line-webfont.woff similarity index 100% rename from style/introrustg-base2line-webfont.woff rename to static/style/introrustg-base2line-webfont.woff diff --git a/style/introrustg-base2line-webfont.woff2 b/static/style/introrustg-base2line-webfont.woff2 similarity index 100% rename from style/introrustg-base2line-webfont.woff2 rename to static/style/introrustg-base2line-webfont.woff2 diff --git a/style/introscriptr-h2base-webfont.eot b/static/style/introscriptr-h2base-webfont.eot similarity index 100% rename from style/introscriptr-h2base-webfont.eot rename to static/style/introscriptr-h2base-webfont.eot diff --git a/style/introscriptr-h2base-webfont.svg b/static/style/introscriptr-h2base-webfont.svg similarity index 100% rename from style/introscriptr-h2base-webfont.svg rename to static/style/introscriptr-h2base-webfont.svg diff --git a/style/introscriptr-h2base-webfont.ttf b/static/style/introscriptr-h2base-webfont.ttf similarity index 100% rename from style/introscriptr-h2base-webfont.ttf rename to static/style/introscriptr-h2base-webfont.ttf diff --git a/style/introscriptr-h2base-webfont.woff b/static/style/introscriptr-h2base-webfont.woff similarity index 100% rename from style/introscriptr-h2base-webfont.woff rename to static/style/introscriptr-h2base-webfont.woff diff --git a/style/introscriptr-h2base-webfont.woff2 b/static/style/introscriptr-h2base-webfont.woff2 similarity index 100% rename from style/introscriptr-h2base-webfont.woff2 rename to static/style/introscriptr-h2base-webfont.woff2 diff --git a/style/linien1.svg b/static/style/linien1.svg similarity index 100% rename from style/linien1.svg rename to static/style/linien1.svg diff --git a/style/styles.css b/static/style/styles.css similarity index 100% rename from style/styles.css rename to static/style/styles.css diff --git a/templates/datenschutz.html b/templates/datenschutz.html deleted file mode 100755 index 5a8bd25..0000000 --- a/templates/datenschutz.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "skeleton.html.j2" %} -{% block content %} -

Datenschutz

-

- Die Nutzung unserer Webseite ist in der Regel ohne Angabe personenbezogener Daten möglich. - Soweit auf unseren Seiten personenbezogene Daten (beispielsweise Name, Anschrift oder Email-Adressen) erhoben werden, - erfolgt dies, soweit möglich, stets auf freiwilliger Basis. - Diese Daten werden ohne Ihre ausdrückliche Zustimmung nicht an Dritte weitergegeben. -

-

- Wir weisen darauf hin, - dass die Datenübertragung im Internet (z.B. bei der Kommunikation per Email) Sicherheitslücken aufweisen kann. - Ein lückenloser Schutz der Daten vor dem Zugriff durch Dritte ist nicht möglich. -

-

- Der Nutzung von im Rahmen der Impressumspflicht veröffentlichten Kontaktdaten durch Dritte zur Übersendung von nicht ausdrücklich angeforderter Werbung und Informationsmaterialien wird hiermit ausdrücklich widersprochen. - Die Betreiber der Seiten behalten sich ausdrücklich rechtliche Schritte im Falle der unverlangten Zusendung von Werbeinformationen, etwa durch Spam-Mails, vor. -

-

- Quellverweis: Disclaimer von eRecht24, dem Portal zum Internetrecht von Rechtsanwalt Sören Siebert -

-{% endblock %} diff --git a/templates/footer.html.j2 b/templates/footer.html.j2 deleted file mode 100644 index 4bd5095..0000000 --- a/templates/footer.html.j2 +++ /dev/null @@ -1,5 +0,0 @@ -
-
- Impressum | Datenschutzhinweis -
-
diff --git a/templates/header.html.j2 b/templates/header.html.j2 deleted file mode 100644 index c4f6efd..0000000 --- a/templates/header.html.j2 +++ /dev/null @@ -1,13 +0,0 @@ - - - - Reudnetz - Internet für Leipzig Osten - - - - - - - - - diff --git a/templates/impressum.html b/templates/impressum.html deleted file mode 100755 index 98ea1bc..0000000 --- a/templates/impressum.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "skeleton.html.j2" %} -{% block content %} -

Impressum

-

Verantwortlich für diese Website ist der -

-
    -
  • Reudnetz w.V.
    • -
  • Wurzner Straße 2
    • -
  • 04315 Leipzig
    • -
-
-

-

- Wir kümmern uns sorgfältig um die Inhalte der Website, Haftung übernehmen wir. - Sollte es doch einmal etwas zu beanstanden geben, bitten wir darum, uns dies mitzuteilen. -

- -

- Für Dinge, die durch Links mit dieser Website verbunden sind, übernehmen wir natürlich keine Haftung. - Rekursiv fortgesetzt hieße das, wir würden die Haftung für das ganze Internet übernehmen. - Das erscheint uns beim besten Willen etwas großspurig. -

- -

- Alle Dateien auf dieser Webseite, für die kein anderes Urheberrecht gilt, fallen unter Creative Commons (cc-sa-by). -

-{% endblock %} - -{% block seitenleiste %} -

Credits

-

Webdesign und Realisation
-meerwinck communication

- -

Hintergrundbild
-pixabay.com / nvtrlab (Lizenz: CC0 Public Domain) -

- -

Schrift:
-Intro Rust Free

-{% endblock %} diff --git a/templates/index.html b/templates/index.html old mode 100755 new mode 100644 index 9816491..7e44eb8 --- a/templates/index.html +++ b/templates/index.html @@ -1,17 +1,73 @@ -{% extends "skeleton.html.j2" %} -{% block content %} -

Willkommen im Reudnetz

-

- Wir bieten kostengünstige Internetanschlüsse in Volkmarsdorf, Reudnitz und Neustadt-Neuschönefeld an. - Gemeinschaftlich organisiert. -

+ + + + {% block title %} + {{ section.title }} - {{ config.title }} + {% endblock title %} + + + + + + + + + +
+
+
+ Impressum | Datenschutzhinweis +
+
+

Reudnetz

+
+
+

Internet für Leipzigs Osten

+
+
+
+
+
    + {% block nav %} + {% set section = get_section(path="_index.md") %} + {% for page in section.pages %} +
  • + {{ page.title }} +
  • + {% endfor %} + {% endblock nav %} +
+
+
+
+
+ {% block content %} + {{ section.content | safe }} + {% endblock content %} -

Was unsere Anschlüsse ausmacht: -

    -
  • ein Mitspracherecht an der Zukunft des Providers
    • -
  • Transparenz auf allen Ebenen
    • -
  • symmetrische Anschlüsse
    • -
  • günstige Preise
    • -
  • fristlos zum Monatsende kündbar
    • -
-{% endblock %} +
+
+ {% block seitenleiste %} +

Kontakt

+

+ mail [at] reudnetz [dot] org
+ GPG-Key: 0x1D7AE62C +

+
+ Fingerprint:
+ C2B5 52B8 9C17 7ED0 9E83 9582 E177 B5B2 1D7A E62C +
+ + {% endblock seitenleiste %} +
+
+
+
+ Impressum | Datenschutzhinweis +
+
+
+ + diff --git a/templates/nav.html.j2 b/templates/nav.html.j2 deleted file mode 100644 index fa50e97..0000000 --- a/templates/nav.html.j2 +++ /dev/null @@ -1,19 +0,0 @@ -{% set navigation_bar = [ -('index.html', 'Reudnetz - Internet für Leipzigs Osten', 'Wilkommen'), -('was.html', 'Was genau verkauft Reudnetz', 'Was'), -('wie.html', 'Wie funktioniert das?', 'Wie'), -('wer.html', 'Wer ist Reudnetz', 'Wer'), -('warum.html', 'Warum gibt es Reudnetz', 'Warum'), -('wiki.html', 'Kein Wiki - Aktuell gibts hier nur Anleitungen', 'Wiki') -] -%} -
-
-
    - {% for href, title, caption in navigation_bar %} - - {{ caption }} - - {% endfor %} -
-
-
diff --git a/templates/page.html b/templates/page.html new file mode 100644 index 0000000..7135463 --- /dev/null +++ b/templates/page.html @@ -0,0 +1,9 @@ +{% extends "index.html" %} + +{% block title %} + {{ page.title }} - {{ config.title }} +{% endblock title %} + +{% block content %} +{{ page.content | safe }} +{% endblock content %} diff --git a/templates/404.html b/templates_old/404.html similarity index 100% rename from templates/404.html rename to templates_old/404.html diff --git a/templates/anleitungen/router.html b/templates_old/anleitungen/router.html similarity index 100% rename from templates/anleitungen/router.html rename to templates_old/anleitungen/router.html diff --git a/templates_old/index.html b/templates_old/index.html new file mode 100755 index 0000000..a653bc2 --- /dev/null +++ b/templates_old/index.html @@ -0,0 +1,38 @@ + +
+
+
+ Impressum | Datenschutzhinweis +
+
+

Reudnetz

+
+
+

Internet für Leipzigs Osten

+
+
+
+
+ {% block content %} + {% endblock %} +
+
+ {% block seitenleiste %} +

Kontakt

+

+ mail [at] reudnetz [dot] org
+ GPG-Key: 0x1D7AE62C +

+
+ Fingerprint:
+ C2B5 52B8 9C17 7ED0 9E83 9582 E177 B5B2 1D7A E62C +
+ + {% endblock %} +
+
+
+ + diff --git a/templates/skeleton.html.j2 b/templates_old/skeleton.html.j2 similarity index 100% rename from templates/skeleton.html.j2 rename to templates_old/skeleton.html.j2 diff --git a/templates/warum.html b/templates_old/warum.html similarity index 100% rename from templates/warum.html rename to templates_old/warum.html diff --git a/templates/was.html b/templates_old/was.html similarity index 100% rename from templates/was.html rename to templates_old/was.html diff --git a/templates/wer.html b/templates_old/wer.html similarity index 100% rename from templates/wer.html rename to templates_old/wer.html diff --git a/templates/wie.html b/templates_old/wie.html similarity index 100% rename from templates/wie.html rename to templates_old/wie.html diff --git a/templates/wiki.html b/templates_old/wiki.html similarity index 100% rename from templates/wiki.html rename to templates_old/wiki.html