From 30de301c3eda83c84c64234b4fb5e06c6373e50e Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 10 Dec 2020 19:27:58 +0100 Subject: [PATCH 1/4] Replace FAQ with 'Creatures of Cyberverse' page --- content/creatures-of-cyberverse.de.md | 9 +++++++++ content/creatures-of-cyberverse.md | 9 +++++++++ content/faq.de.md | 22 ---------------------- content/faq.md | 22 ---------------------- 4 files changed, 18 insertions(+), 44 deletions(-) create mode 100644 content/creatures-of-cyberverse.de.md create mode 100644 content/creatures-of-cyberverse.md delete mode 100644 content/faq.de.md delete mode 100644 content/faq.md diff --git a/content/creatures-of-cyberverse.de.md b/content/creatures-of-cyberverse.de.md new file mode 100644 index 0000000..7ec1613 --- /dev/null +++ b/content/creatures-of-cyberverse.de.md @@ -0,0 +1,9 @@ +--- +title: Creatures of Cyberverse +menu: + main: + name: Das Spiel + weight: 3 +--- + + diff --git a/content/creatures-of-cyberverse.md b/content/creatures-of-cyberverse.md new file mode 100644 index 0000000..bd9ecd5 --- /dev/null +++ b/content/creatures-of-cyberverse.md @@ -0,0 +1,9 @@ +--- +title: Creatures of Cyberverse +menu: + main: + name: The Game + weight: 3 +--- + + diff --git a/content/faq.de.md b/content/faq.de.md deleted file mode 100644 index 344be4d..0000000 --- a/content/faq.de.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: FAQ -menu: - main: - weight: 3 ---- - -#### Was ist die Antwort auf die Frage nach dem Leben, dem Universum und dem ganzen Rest? - -41.99999999999999 - -#### Wie viele? - -ALLE! - -#### Welcher Texteditor? - -Lochkartenstanzer - -#### Kaffee oder Tee? - -Ja. diff --git a/content/faq.md b/content/faq.md deleted file mode 100644 index c982b5d..0000000 --- a/content/faq.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: FAQ -menu: - main: - weight: 3 ---- - -#### What is "The Answer to the Ultimate Question of Life, the Universe, and Everything"? - -41.99999999999999 - -#### How much ... - -... IS THE FISH? - -#### Which text editor? - -A keypunch - -#### Coffee or tea? - -Yes. From f2eacc5e1d8a5a83ca53c92ce3821422989da0a6 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 10 Dec 2020 19:34:27 +0100 Subject: [PATCH 2/4] Make 'schedule' the second menu item --- content/about.de.md | 2 +- content/about.md | 2 +- content/creatures-of-cyberverse.de.md | 2 +- content/creatures-of-cyberverse.md | 2 +- content/news/_index.de.md | 2 +- content/news/_index.md | 2 +- content/schedule.de.md | 2 +- content/schedule.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/content/about.de.md b/content/about.de.md index 166f7c7..2478296 100644 --- a/content/about.de.md +++ b/content/about.de.md @@ -2,7 +2,7 @@ title: Über uns menu: main: - weight: 4 + weight: 5 --- franconian.net ist ein loses Netzwerk von einigen fränkischen Hackspaces, das sich erstmalig zum Chaos Communication Camp 2019 für ein gemeinsames Village organisiert hat. Dieser Zusammenschluss hat das CCCamp19 überdauert und findet sich vor allem zu weiteren Veranstaltungen des Chaos Computer Clubs immer wieder zusammen. Auch zur remote Chaos Experience haben sich wieder einige dieser Hackspaces gefunden und betreiben zusammen das franconian.net diff --git a/content/about.md b/content/about.md index 58fba76..635f094 100644 --- a/content/about.md +++ b/content/about.md @@ -2,7 +2,7 @@ title: About us menu: main: - weight: 4 + weight: 5 --- The Franconian Cluster is a network of franconian hackspaces that organised the Franconian Village at Chaos Communication Camp 2019. After that, we continued our cooperation mainly at other events held by the Chaos Computer Club. For the first Remote Chaos Experience (rC3), some of the involved spaces decided to create a virtual assembly: franconian.net diff --git a/content/creatures-of-cyberverse.de.md b/content/creatures-of-cyberverse.de.md index 7ec1613..f509c80 100644 --- a/content/creatures-of-cyberverse.de.md +++ b/content/creatures-of-cyberverse.de.md @@ -3,7 +3,7 @@ title: Creatures of Cyberverse menu: main: name: Das Spiel - weight: 3 + weight: 4 --- diff --git a/content/creatures-of-cyberverse.md b/content/creatures-of-cyberverse.md index bd9ecd5..7cc9af6 100644 --- a/content/creatures-of-cyberverse.md +++ b/content/creatures-of-cyberverse.md @@ -3,7 +3,7 @@ title: Creatures of Cyberverse menu: main: name: The Game - weight: 3 + weight: 4 --- diff --git a/content/news/_index.de.md b/content/news/_index.de.md index 58a19d2..db0698f 100644 --- a/content/news/_index.de.md +++ b/content/news/_index.de.md @@ -2,6 +2,6 @@ title: News menu: main: - weight: 2 + weight: 3 --- diff --git a/content/news/_index.md b/content/news/_index.md index 58a19d2..db0698f 100644 --- a/content/news/_index.md +++ b/content/news/_index.md @@ -2,6 +2,6 @@ title: News menu: main: - weight: 2 + weight: 3 --- diff --git a/content/schedule.de.md b/content/schedule.de.md index e332ec0..3fa6999 100644 --- a/content/schedule.de.md +++ b/content/schedule.de.md @@ -2,7 +2,7 @@ title: Programm menu: main: - weight: 5 + weight: 2 --- Das Programm erscheint in Kürze. diff --git a/content/schedule.md b/content/schedule.md index 6639b7f..0673d00 100644 --- a/content/schedule.md +++ b/content/schedule.md @@ -2,7 +2,7 @@ title: Schedule menu: main: - weight: 5 + weight: 2 --- The schedule for the franconian.net channel will be released shortly. From d20d05b69a3634e7c56915ee45d7c2d8f96c24c2 Mon Sep 17 00:00:00 2001 From: legion Date: Thu, 10 Dec 2020 19:35:26 +0100 Subject: [PATCH 3/4] Complement imprint --- content/imprint.de.md | 4 ++++ content/imprint.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/content/imprint.de.md b/content/imprint.de.md index 3ca6f5a..e64091a 100644 --- a/content/imprint.de.md +++ b/content/imprint.de.md @@ -6,3 +6,7 @@ menu: footer backspace e. V. Spiegelgraben 41 96052 Bamberg + +Inhaltlich Verantwortlich: +Vorstand des backspace e.V. +rc3orga@lists.hackerspace-bamberg.de diff --git a/content/imprint.md b/content/imprint.md index c4267c8..0f61aef 100644 --- a/content/imprint.md +++ b/content/imprint.md @@ -7,3 +7,7 @@ backspace e. V. Spiegelgraben 41 96052 Bamberg Germany + +Content responsibility: +board of backspace e.V. +rc3orga@lists.hackerspace-bamberg.de From 01dfd6a5744fbee478011a33c238205943715f58 Mon Sep 17 00:00:00 2001 From: legion Date: Thu, 10 Dec 2020 19:53:10 +0100 Subject: [PATCH 4/4] Update imprint --- content/imprint.de.md | 6 +++--- content/imprint.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/imprint.de.md b/content/imprint.de.md index e64091a..cd9514c 100644 --- a/content/imprint.de.md +++ b/content/imprint.de.md @@ -7,6 +7,6 @@ backspace e. V. Spiegelgraben 41 96052 Bamberg -Inhaltlich Verantwortlich: -Vorstand des backspace e.V. -rc3orga@lists.hackerspace-bamberg.de +Inhaltlich Verantwortlich: +Vorstand des backspace e.V. +rc3orga@lists.hackerspace-bamberg.de diff --git a/content/imprint.md b/content/imprint.md index 0f61aef..8de72d8 100644 --- a/content/imprint.md +++ b/content/imprint.md @@ -8,6 +8,6 @@ Spiegelgraben 41 96052 Bamberg Germany -Content responsibility: -board of backspace e.V. +Content responsibility: +board of backspace e.V. rc3orga@lists.hackerspace-bamberg.de